Merge commit 'fml/master' into next

diff --git a/fade.c b/fade.c
index 0304f4c6637a00fb89d9c5e43c6f04c78b616d16..aa7997eb94b87ee34dc8b3d334c9e7a200ddf88d 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -216,7 +216,7 @@ static int sweet_dreams(void)
                tm->tm_sec = 0;
        } else {
                t1 += 9 * 60 * 60; /* nine hours from now */
-               PARA_INFO_LOG("default wake time: %lu\n", t1);
+               PARA_INFO_LOG("default wake time: %lu\n", (long unsigned)t1);
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);

diff --git a/filter.c b/filter.c
index 4113690439184012724c33908ae535e23c29b12a..99b12217b8cc1e701c428928478a03a00ccd0c74 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -122,6 +122,7 @@ static int parse_config(int argc, char *argv[])
        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);
@@ -164,7 +165,6 @@ int main(int argc, char *argv[])
        ret = parse_config(argc, argv);
        if (ret < 0)
                goto out;
-       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        ret = init_filter_chain();
        if (ret < 0)
                goto out;

diff --git a/recv.c b/recv.c
index 42fd335f1466a7c01419b59872d29d5be679f907..d01dab68847fc93912edb7e9c7a1e873cf11a1e5 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -53,6 +53,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
        HANDLE_VERSION_FLAG("recv", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
@@ -87,7 +88,6 @@ int main(int argc, char *argv[])
                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);