X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=438707d7328696f5d6285d8a3cb9dae6cd23eaec;hp=9565102709f53446e7ebf5e978fd9bae733f4dc0;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=c79899fe6a1e8eb3086749f46c599d9790d99921

diff --git a/client.c b/client.c
index 95651027..438707d7 100644
--- a/client.c
+++ b/client.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file client.c the client program used to connect to para_server */
@@ -41,10 +29,10 @@ static void client_event_handler(struct task *t)
 {
 	struct private_client_data *p = t->private_data;
 
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
 	if (t->ret != -E_HANDSHAKE_COMPLETE) {
 		unregister_task(t);
-		p->eof = 1;
+		p->error = t->ret;
 		return;
 	}
 	if (p->status == CL_SENDING) {
@@ -53,13 +41,13 @@ static void client_event_handler(struct task *t)
 		register_task(&sit.task);
 		p->inbuf = sit.buf;
 		p->in_loaded = &sit.loaded;
-		p->in_eof = &sit.eof;
+		p->in_error = &sit.error;
 		return;
 	}
 	stdout_set_defaults(&sot);
 	sot.buf = p->buf;
 	sot.loaded = &p->loaded;
-	sot.input_eof = &p->eof;
+	sot.input_error = &p->error;
 	register_task(&sot.task);
 }
 
@@ -89,9 +77,9 @@ int main(int argc, char *argv[])
 	if (ret < 0) /* can not use PARA_LOG here */
 		exit(EXIT_FAILURE);
 	pcd->task.event_handler = client_event_handler;
-	ret = sched(&s);
+	ret = schedule(&s);
 	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	client_close(pcd);
 	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }