X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=5de9c6be1779855b00a4698b6638aa4d67072305;hp=2386c1ef58930f140109918764acba5266c33a13;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hpb=6bdac07456cb5872f824028912d1049883a9c21f diff --git a/recv.c b/recv.c index 2386c1ef..5de9c6be 100644 --- a/recv.c +++ b/recv.c @@ -16,14 +16,16 @@ #include "recv.h" #include "recv.cmdline.h" #include "fd.h" +#include "string.h" #include "error.h" #include "stdout.h" /** the gengetopt args info struct */ struct recv_args_info conf; -/** always log to stderr */ -INIT_STDERR_LOGGING(conf.loglevel_arg); +static int loglevel; +/** Always log to stderr. */ +INIT_STDERR_LOGGING(loglevel); /** init array of error codes used by para_recv */ INIT_RECV_ERRLISTS; @@ -77,14 +79,14 @@ int main(int argc, char *argv[]) memset(&sot, 0, sizeof(struct stdout_task)); memset(&rn, 0, sizeof(struct receiver_node)); - FOR_EACH_RECEIVER(ret) - receivers[ret].init(&receivers[ret]); + recv_init(); ret = -E_RECV_SYNTAX; rn.conf = parse_config(argc, argv, &receiver_num); if (!rn.conf) { PARA_EMERG_LOG("parse failed\n"); goto out; } + loglevel = get_loglevel_by_name(conf.loglevel_arg); r = &receivers[receiver_num]; rn.receiver = r; ret = r->open(&rn); @@ -93,7 +95,7 @@ int main(int argc, char *argv[]) r_opened = 1; stdout_set_defaults(&sot); - sot.buf = rn.buf; + sot.bufp = &rn.buf; sot.loaded = &rn.loaded; sot.input_error = &rn.task.error; register_task(&sot.task);