From: Andre Noll <maan@systemlinux.org>
Date: Thu, 9 Jul 2009 14:14:28 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~53
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=6f5030f4b257aba7ea4265ef3ae35d96477bbfc3;hp=a37e903213215dd36b11bbde4ea98e1d4590a472

Merge branch 'master' into next
---

diff --git a/fade.c b/fade.c
index 0304f4c6..aa7997eb 100644
--- 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 41136904..99b12217 100644
--- 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 42fd335f..d01dab68 100644
--- 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);