Changeset 1064 in MondoRescue for branches/stable/mondo/src/lib

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable/mondo/src/lib

Files:

• mr_conf.c (modified) (2 diffs)
• mr_err.c (modified) (1 diff)
• mr_mem.c (modified) (2 diffs)
• mr_msg.c (modified) (5 diffs)

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

@@ -68 +68 @@
 static size_t mr_conf_filesize(const char *name);
 static void mr_conf_error_msg(int error_code, const char *add_line);
-static void mr_conf_remove_comments();
+static void mr_conf_remove_comments(void);
 static int mr_conf_check_int_flag(const int flag);
 static void mr_conf_set_int_flag(const int flag);
@@ -141 +141 @@
 
 /*release all memory and prepare to the next possiable config file*/
-void mr_conf_close() {
+void mr_conf_close(void) {
     /* if not opened => error */
     if (!mr_conf_check_int_flag(MRCONF_INTFLAG_OPEN)) {

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

@@ -9 +9 @@
  * Provided under the GPLv2
  */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 
 #include <stdio.h>

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

@@ -9 +9 @@
  * Provided under the GPLv2
  */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
@@ -52 +56 @@
 
 /* encapsulation function for asprintf */
-void mr_asprintf(char **strp, const char *fmt, va_list args) {
+void mr_asprintf(char **strp, const char *fmt, ...) {
 
     int res = 0;
+    va_list args;
 
+    va_start(args,fmt);
     res = vasprintf(strp, fmt, args);
     if (res == -1) {
         mr_log_exit(-1,"Unable to alloc memory in mr_asprintf\nExiting...");
     }
+    va_end(args);
 }
 

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);
 }