X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=cead11a345362178b99b36a159a6bea4f496df7b;hp=8639ce2b63c654fa36595adcd79a2b68fbfa79e4;hb=883af7d8af543616fe4ca09b0273dd4f59848779;hpb=704605b466aca3ae6ca6d1e03b6af55e3d245502 diff --git a/recv.c b/recv.c index 8639ce2b..cead11a3 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * 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 @@ -25,7 +25,7 @@ #include "error.h" #include "stdout.h" -struct gengetopt_args_info conf; +struct recv_args_info conf; INIT_RECV_ERRLISTS; @@ -45,7 +45,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) { int i; - if (cmdline_parser(argc, argv, &conf)) + if (recv_cmdline_parser(argc, argv, &conf)) return NULL; if (conf.list_receivers_given) { printf("available receivers: "); @@ -58,9 +58,11 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) return check_receiver_arg(conf.receiver_arg, receiver_num); } -void rn_event_handler(struct task *t) +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; unregister_task(t); } @@ -72,7 +74,6 @@ int main(int argc, char *argv[]) struct stdout_task sot; struct sched s; - init_sched(); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; @@ -105,7 +106,6 @@ int main(int argc, char *argv[]) sprintf(rn.task.status, "receiver node"); register_task(&rn.task); - ret = sched(&s); out: if (r_opened)