Merge branch 't/buffer_tree_improvements'

[paraslash.git] / afh_recv.c

diff --git a/afh_recv.c b/afh_recv.c
index aa27c8b5c2688133cef3057cf947a453950f3aeb..5c17dab7de21132cf48d50bfaf37eabba506ce6f 100644 (file)
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -70,10 +70,8 @@ static void *afh_recv_parse_config(int argc, char **argv)
 {
        struct afh_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-       if (!afh_recv_cmdline_parser(argc, argv, tmp))
-               return tmp;
-       free(tmp);
-       return NULL;
+       afh_recv_cmdline_parser(argc, argv, tmp);
+       return tmp;
 }
 
 static void afh_recv_free_config(void *conf)
@@ -252,13 +250,10 @@ void afh_recv_init(struct receiver *r)
        r->open = afh_recv_open;
        r->close = afh_recv_close;
        r->pre_select = afh_recv_pre_select;
-       r->new_post_select = afh_recv_post_select;
+       r->post_select = afh_recv_post_select;
        r->parse_config = afh_recv_parse_config;
        r->free_config = afh_recv_free_config;
        r->execute = afh_execute;
-       r->help = (struct ggo_help) {
-               .short_help = afh_recv_args_info_help,
-               .detailed_help = afh_recv_args_info_detailed_help
-       };
+       r->help = (struct ggo_help)DEFINE_GGO_HELP(afh_recv);
        afh_recv_cmdline_parser_free(&dummy);
 }