X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=55e97f1e49ed6248ec415598d95762ee9f3f82fa;hp=0fe46411df8348cb92b65d2f22902f36f03d133f;hb=2ef1e962280493eee9092da3122760805b793112;hpb=6105cde18ae21b82708a4c98aa2d54820afd47a5 diff --git a/recv.c b/recv.c index 0fe46411..55e97f1e 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -48,8 +48,8 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) static void rn_event_handler(struct task *t) { struct receiver_node *rn = t->private_data; - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); - rn->eof = 1; + PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret)); + rn->error = t->ret; unregister_task(t); } @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) ret = -E_RECV_SYNTAX; rn.conf = parse_config(argc, argv, &receiver_num); if (!rn.conf) { - PARA_EMERG_LOG("%s", "parse failed\n"); + PARA_EMERG_LOG("parse failed\n"); goto out; } r = &receivers[receiver_num]; @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) stdout_set_defaults(&sot); sot.buf = rn.buf; sot.loaded = &rn.loaded; - sot.input_eof = &rn.eof; + sot.input_error = &rn.error; register_task(&sot.task); rn.task.private_data = &rn; @@ -111,6 +111,6 @@ out: if (r) r->shutdown(); if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }