X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=0a8f081839b97f6b0aaaac7ce3cc9e3d2bc049d1;hp=9a02bdcabc3c252fb875b893cea5610f23243b2e;hb=56955f95584f51709320262f7d2e0ea79301d346;hpb=806fcbb5a8c00d6b8c1a228b9b4d6b6758f613ca

diff --git a/gui.c b/gui.c
index 9a02bdca..0a8f0818 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -489,17 +489,19 @@ static int add_output_line(char *line, __a_unused void *data)
 	return 1;
 }
 
-void para_log(int ll, const char *fmt,...)
+static int loglevel;
+
+__printf_2_3 void para_log(int ll, const char *fmt,...)
 {
 	int color;
 	char *msg;
 
-	if (ll < conf.loglevel_arg || !curses_active)
+	if (ll < loglevel || !curses_active)
 		return;
 	switch (ll) {
-		case DEBUG:
-		case INFO:
-		case NOTICE:
+		case LL_DEBUG:
+		case LL_INFO:
+		case LL_NOTICE:
 			color = COLOR_MSG;
 			break;
 		default:
@@ -523,7 +525,7 @@ static void setup_signal_handling(void)
 	signal(SIGHUP, SIG_IGN);
 }
 
-static void do_exit(int ret)
+__noreturn static void do_exit(int ret)
 {
 	signal(SIGTERM, SIG_IGN);
 	kill(0, SIGTERM);
@@ -539,7 +541,7 @@ static void shutdown_curses(void)
 	endwin();
 }
 
-static void finish(int ret)
+__noreturn static void finish(int ret)
 {
 	shutdown_curses();
 	do_exit(ret);
@@ -548,7 +550,7 @@ static void finish(int ret)
 /*
  * exit curses and print given message to stdout/stderr
  */
-__printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
+__noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
 {
 	va_list argp;
 	FILE *outfd = ret? stderr: stdout;
@@ -562,8 +564,7 @@ __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
 
 static void print_welcome(void)
 {
-	int ll = conf.loglevel_arg;
-	if (ll > NOTICE)
+	if (loglevel > LL_NOTICE)
 		return;
 	outputf(COLOR_WELCOME, "Welcome to para_gui " PACKAGE_VERSION
 		" \"" CODENAME "\". Theme: %s", theme.name);
@@ -1168,24 +1169,24 @@ err_out:
 
 static void com_ll_decr(void)
 {
-	if (conf.loglevel_arg <= DEBUG) {
+	if (loglevel <= LL_DEBUG) {
 		print_in_bar(COLOR_ERRMSG,
 			"loglevel already at maximal verbosity\n");
 		return;
 	}
-	conf.loglevel_arg--;
-	print_in_bar(COLOR_MSG, "loglevel set to %d\n", conf.loglevel_arg);
+	loglevel--;
+	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
 }
 
 static void com_ll_incr(void)
 {
-	if (conf.loglevel_arg >= EMERG) {
+	if (loglevel >= LL_EMERG) {
 		print_in_bar(COLOR_ERRMSG,
-			"loglevel already at miminal verbosity\n");
+			"loglevel already at minimal verbosity\n");
 		return;
 	}
-	conf.loglevel_arg++;
-	print_in_bar(COLOR_MSG, "loglevel set to %d\n", conf.loglevel_arg);
+	loglevel++;
+	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
 }
 
 /*
@@ -1280,7 +1281,7 @@ static void com_version(void)
 		CODENAME "\"");
 }
 
-static void com_quit(void)
+__noreturn static void com_quit(void)
 {
 	finish(0);
 }
@@ -1391,6 +1392,7 @@ int main(int argc, char *argv[])
 		};
 		gui_cmdline_parser_config_file(cf, &conf, &params);
 	}
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map in config file\n");
 		exit(EXIT_FAILURE);