X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=715df9c6a3aa8b107ef4bcfdffaad9a0c1abea2f;hp=c194e1929b9dfa2cb7704ca1f6b78dd704eb3815;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=32ffc06c0706f51c3f1dc436911836f1f9aa326e

diff --git a/client.c b/client.c
index c194e192..715df9c6 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -114,11 +114,11 @@ static int execute_client_command(const char *cmd, char **result)
 		goto out;
 	schedule(&command_sched);
 	*result = exec_task.result_buf;
-	btr_remove_node(exec_task.btrn);
+	btr_remove_node(&exec_task.btrn);
 	client_disconnect(ct);
 	ret = 1;
 out:
-	btr_free_node(exec_task.btrn);
+	btr_remove_node(&exec_task.btrn);
 	if (ret < 0)
 		free(exec_task.result_buf);
 	return ret;
@@ -307,7 +307,7 @@ static void setatt_completer(struct i9e_completion_info *ci,
 		free(orig);
 	}
 	sl[2 * num_atts] = NULL;
-	ret = i9e_extract_completions(ci->word, sl, &cr->matches);
+	i9e_extract_completions(ci->word, sl, &cr->matches);
 out:
 	free(buf);
 	free_argv(sl);
@@ -612,14 +612,14 @@ int main(int argc, char *argv[])
 		case -E_BTR_EOF:
 			ret = 0;
 			break;
-		default: ret = ct->task.error;
+		default: ret = -E_SERVER_CMD_FAILURE;
 		}
 	}
 out:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	client_close(ct);
-	btr_free_node(sit.btrn);
-	btr_free_node(sot.btrn);
+	btr_remove_node(&sit.btrn);
+	btr_remove_node(&sot.btrn);
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }