X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=0316e3653eecf8e0507a5615e42124178c2f9b87;hp=a3c07ec796bd9d179ef633b3d81d91c14b42c834;hb=f0e41e36c3f1a3a5bb6ff66d92d2814391d8f908;hpb=5ff2b0b3a6f9242033c436fb8272245f5594dd8c

diff --git a/gui.c b/gui.c
index a3c07ec7..0316e365 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -336,11 +336,14 @@ static int align_str(WINDOW* win, char *str, unsigned int len,
 __printf_2_3 static void print_in_bar(int color, const char *fmt,...)
 {
 	char *msg;
+	va_list ap;
 
 	if (!curses_active)
 		return;
 	wattron(in.win, COLOR_PAIR(color));
-	PARA_VSPRINTF(fmt, msg);
+	va_start(ap, fmt);
+	xvasprintf(&msg, fmt, ap);
+	va_end(ap);
 	wmove(in.win, 0, 0);
 	align_str(in.win, msg, sb.cols, LEFT);
 	free(msg);
@@ -471,10 +474,13 @@ static void rb_add_entry(int color, char *msg)
 __printf_2_3 static void outputf(int color, const char* fmt,...)
 {
 	char *msg;
+	va_list ap;
 
 	if (!curses_active)
 		return;
-	PARA_VSPRINTF(fmt, msg);
+	va_start(ap, fmt);
+	xvasprintf(&msg, fmt, ap);
+	va_end(ap);
 	rb_add_entry(color, msg);
 	wrefresh(bot.win);
 }
@@ -489,10 +495,11 @@ static int add_output_line(char *line, __a_unused void *data)
 
 static int loglevel;
 
-__printf_2_3 void para_log(int ll, const char *fmt,...)
+__printf_2_3 void curses_log(int ll, const char *fmt,...)
 {
 	int color;
 	char *msg;
+	va_list ap;
 
 	if (ll < loglevel || !curses_active)
 		return;
@@ -505,11 +512,14 @@ __printf_2_3 void para_log(int ll, const char *fmt,...)
 		default:
 			color = COLOR_ERRMSG;
 	}
-	PARA_VSPRINTF(fmt, msg);
+	va_start(ap, fmt);
+	xvasprintf(&msg, fmt, ap);
+	va_end(ap);
 	chop(msg);
 	rb_add_entry(color, msg);
 	wrefresh(bot.win);
 }
+__printf_2_3 void (*para_log)(int, const char*, ...) = curses_log;
 
 static void setup_signal_handling(void)
 {