Changeset 1065 in MondoRescue

Timestamp:

Jan 23, 2007, 3:48:48 AM (18 years ago)

Author:

Bruno Cornec

Message:

More tests in
mr_msg function doesn't cascade to _mr_msg anymore, as it doesn't seem to work correctly with multiple varargs entries (I've not found how to do it correctly, so I give up for the moment)
lib code pass valgrind without issue.

Location:

branches/stable/mondo/src

Files:

• lib/mr_msg.c (modified) (4 diffs)
• test/mktest (modified) (2 diffs)
• test/test-msg.c (added)
• test/test-msg.res (added)

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

@@ -20 +20 @@
 static char *mr_logfile = NULL;
 
+/*
+ * This function is in the lowest part of the tree
+ * It should not depend on any other function of the mr lib 
+ */
+
 /* Cleanup function for messages */
 void mr_msg_close(void) {
     free(mr_logfile);
     mr_logfile = NULL;
+    mr_loglevel = 0;
 }
 
@@ -47 +53 @@
  * but through other functions
  */
-void _mr_msg(int debug, const char *file, const char *function, int line, const char *fmt, ...) {
+void mr_msg(int debug, const char *fmt, ...) {
 
     int i = 0;
@@ -63 +69 @@
             return;
         }
-        va_start(args,fmt);
 
         // add 2 spaces to distinguish log levels
@@ -69 +74 @@
             for (i = 1; i < debug; i++)
                 fprintf(fout, "  ");
-            fprintf(fout, "%s->%s#%d: ", file, function, line);
+            fprintf(fout, "%s->%s#%d: ", __FILE__, __FUNCTION__, __LINE__);
         }
+        va_start(args,fmt);
         if (vfprintf(fout, fmt, args) < 0) {
             fprintf(stderr,"Unable to print to %s\n",mr_logfile);
         }
+        va_end(args);
 
-        fprintf(fout, "\n");
         if ((res = fclose(fout)) != 0) {
             fprintf(stderr,"Unable to close %s\n",mr_logfile);
         }
-        va_end(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);
-}

branches/stable/mondo/src/test/mktest

@@ -16 +16 @@
 gcc $OPT test-conf.c $lib -o test-conf
 
+echo "Testing against previous run"
 for f in test-conf test-string test-msg; do
     chmod 755 $f
@@ -23 +24 @@
         echo "$f test KO !!"
     fi
+    valgrind -q --error-exitcode=1 --leak-check=yes ./$f 2>&1 > /tmp/valgrind-$f.res
+    if [ $? -ne 0 ]; then
+        echo "valgrind $f test KO !!"
+    fi
 done