Changeset 3509 in MondoRescue for branches/3.2/mondo/src/include

Timestamp:

Feb 13, 2016, 2:57:55 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Change mr_msg_int interface by adding the FUNCTION macro
• Use mr_msg in mr_system
• Ability to use that new log system everywhere now

Location:

branches/3.2/mondo/src/include

Files:

• mr_msg.h (modified) (2 diffs)
• mr_sys.h (modified) (2 diffs)

branches/3.2/mondo/src/include/mr_msg.h

@@ -16 +16 @@
 /* functions (public methods) */
 
-#define mr_msg(x,y,args...) {mr_msg_int(x,__LINE__,__FILE__,y,## args);}
-extern void mr_msg_init(const char *configfile, int loglevel);
+#define mr_msg(lvl,fmt,args...) {mr_msg_int(lvl,__LINE__,__FILE__,__FUNCTION__,fmt,## args);}
+extern void mr_msg_init(const char *logfile, int loglevel);
 extern void mr_msg_close(void);
 extern void mr_msg_loglevel(int loglevel);
@@ -23 +23 @@
 /* Internal function bringing debuging info 
  * called indirectly through macros */
-extern inline void mr_msg_int(int debug,int line, const char *file, const char *fmt, ...);
+extern inline void mr_msg_int(int debug, int line, const char *file, const char *function, const char *fmt, ...);
 
 #endif                          /* MR_MSG_H */

branches/3.2/mondo/src/include/mr_sys.h

@@ -14 +14 @@
 #include <stdarg.h>
 #include <stdio.h>
-
-/* functions (public methods) */
-
-#define mr_system(y,args...) mr_system_int(__LINE__,__FILE__,y,## args)
+#include "mr_msg.h"
 
 /* Internal function bringing debuging info 
@@ -23 +20 @@
 extern inline int mr_system_int(int line, char *file, const char *fmt, ...);
 
+/* functions (public methods) */
+#define mr_system(y,args...) mr_system_int(__LINE__,__FILE__,y,## args)
+
+/*  Global variables */
+
+extern int mr_loglevel;
+extern char *mr_logfile;
+
 #endif                          /* MR_SYS_H */