X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=fec88a6f3f459b1f84f12790481c7a4411ae80de;hp=1506f656c28eeaabff0d8213c0b45e597bebeb2e;hb=73aebb78da7297053f41dba5b3f0cefb33ad248e;hpb=6105cde18ae21b82708a4c98aa2d54820afd47a5 diff --git a/client.c b/client.c index 1506f656..fec88a6f 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -29,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) { @@ -41,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); } @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) pcd->task.event_handler = client_event_handler; 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; }