X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=d98c6327c9163d7018f0d94c1c612680205244d7;hp=c6fde49000b3e0844414c979bf6cc5541cff4eed;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=367daa451bd837c3e267c8385bbc92898f06ecca

diff --git a/client.c b/client.c
index c6fde490..d98c6327 100644
--- a/client.c
+++ b/client.c
@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file client.c the client program used to connect to para_server */
+/** \file client.c The client program used to connect to para_server. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <signal.h>
 
 #include "para.h"
@@ -308,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);
@@ -460,11 +459,6 @@ static int client_i9e_line_handler(char *line)
 	return 1;
 }
 
-static void client_sighandler(int s)
-{
-	i9e_signal_dispatch(s);
-}
-
 static struct i9e_completer completers[] = {
 	SERVER_COMPLETERS
 	AFS_COMPLETERS
@@ -495,7 +489,7 @@ __noreturn static void interactive_session(void)
 	}
 	ici.history_file = history_file;
 
-	act.sa_handler = client_sighandler;
+	act.sa_handler = i9e_signal_dispatch;
 	sigemptyset(&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGINT, &act, NULL);
@@ -602,7 +596,7 @@ int main(int argc, char *argv[])
 	 */
 	sit.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	ret = client_open(argc, argv, &ct, &client_loglevel, sit.btrn, NULL, &sched);
+	ret = client_connect(ct, &sched, sit.btrn, NULL);
 	if (ret < 0)
 		goto out;
 	sot.btrn = btr_new_node(&(struct btr_node_description)