Changeset 1064 in MondoRescue for branches/stable/mondo/src/lib/mr_msg.c

Timestamp:

Jan 23, 2007, 1:09:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

More controls at the compiler level
still working with the problems around variable arguments

File:

• branches/stable/mondo/src/lib/mr_msg.c (modified) (5 diffs)

branches/stable/mondo/src/lib/mr_msg.c

@@ -10 +10 @@
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 static int mr_loglevel = 0;
@@ -43 +47 @@
  * but through other functions
  */
-void _mr_msg(int debug, const char *file, const char *function, int line, const char *fmt, va_list args) {
+void _mr_msg(int debug, const char *file, const char *function, int line, const char *fmt, ...) {
 
     int i = 0;
     int res = 0;
     FILE *fout = NULL;
+    va_list args;
 
     if (mr_logfile == NULL) {
@@ -58 +63 @@
             return;
         }
+        va_start(args,fmt);
 
         // add 2 spaces to distinguish log levels
@@ -67 +73 @@
         if (vfprintf(fout, fmt, args) < 0) {
             fprintf(stderr,"Unable to print to %s\n",mr_logfile);
-            return;
         }
 
@@ -74 +79 @@
             fprintf(stderr,"Unable to close %s\n",mr_logfile);
         }
+        va_end(args);
     }
 }
 
-void mr_msg(int level, const char *fmt, va_list args) {
+void mr_msg(int level, const char *fmt, ...) {
 
+    va_list args;
+
+    va_start(args,fmt);
     _mr_msg(level, __FILE__, __FUNCTION__, __LINE__, fmt, args);
+    va_end(args);
 }