X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=73d9999d0408617099086e7b25248af5277839db;hp=1f9df18955306c2c2449444f3c5a0317d1358a4b;hb=1cccf6fa93c251f8f2805aa5fb163741d851c051;hpb=e065f3eec9be99d82da855bf3da38d8e86752fef diff --git a/dccp_recv.c b/dccp_recv.c index 1f9df189..73d9999d 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -11,8 +11,13 @@ * (C) 2005 Ian McDonald */ +#include +#include #include #include +#include +#include +#include #include "para.h" #include "error.h" @@ -107,11 +112,10 @@ static void *dccp_recv_parse_config(int argc, char **argv) { struct dccp_recv_args_info *tmp = para_calloc(sizeof(*tmp)); - if (!dccp_recv_cmdline_parser(argc, argv, tmp) && - dccp_recv_ccid_support_check(tmp)) - return tmp; - free(tmp); - return NULL; + dccp_recv_cmdline_parser(argc, argv, tmp); + if (!dccp_recv_ccid_support_check(tmp)) + exit(EXIT_FAILURE); + return tmp; } static void dccp_recv_pre_select(struct sched *s, struct task *t) @@ -181,9 +185,6 @@ void dccp_recv_init(struct receiver *r) r->post_select = dccp_recv_post_select; r->parse_config = dccp_recv_parse_config; r->free_config = dccp_recv_free_config; - r->help = (struct ggo_help) { - .short_help = dccp_recv_args_info_help, - .detailed_help = dccp_recv_args_info_detailed_help - }; + r->help = (struct ggo_help)DEFINE_GGO_HELP(dccp_recv); dccp_recv_cmdline_parser_free(&dummy); }