Avoid unwanted log messages during startup.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 84ad8577120daf92c338a842e0567da91fa9968b..c6af586df8cc4451413749664dd45630856d9bfa 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -60,16 +60,14 @@ __noreturn static void print_help_and_die(void)
        exit(0);
 }
 
        exit(0);
 }
 

-static int parse_config(int argc, char *argv[])
+static int parse_config(void)

 {
        static char *cf; /* config file */
        struct stat statbuf;
 
 {
        static char *cf; /* config file */
        struct stat statbuf;
 

-       filter_cmdline_parser(argc, argv, &conf);

        HANDLE_VERSION_FLAG("filter", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
        HANDLE_VERSION_FLAG("filter", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();

-       loglevel = get_loglevel_by_name(conf.loglevel_arg);

        if (!cf) {
                char *home = para_homedir();
                cf = make_message("%s/.paraslash/filter.conf", home);
        if (!cf) {
                char *home = para_homedir();
                cf = make_message("%s/.paraslash/filter.conf", home);


@@ -84,6 +82,7 @@ static int parse_config(int argc, char *argv[])
                        .print_errors = 1
                };
                filter_cmdline_parser_config_file(cf, &conf, &params);
                        .print_errors = 1
                };
                filter_cmdline_parser_config_file(cf, &conf, &params);

+               loglevel = get_loglevel_by_name(conf.loglevel_arg);

        }
        if (!conf.filter_given)
                return -E_NO_FILTERS;
        }
        if (!conf.filter_given)
                return -E_NO_FILTERS;


@@ -110,8 +109,10 @@ int main(int argc, char *argv[])
        struct btr_node *parent;
        struct filter_node **fns;
 
        struct btr_node *parent;
        struct filter_node **fns;
 

+       filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);

        filter_init();
        filter_init();

-       ret = parse_config(argc, argv);
+       ret = parse_config();

        if (ret < 0)
                goto out;
        sit->btrn = btr_new_node(&(struct btr_node_description)
        if (ret < 0)
                goto out;
        sit->btrn = btr_new_node(&(struct btr_node_description)