Changeset 1144 in MondoRescue for branches/stable/mondo/src/include/my-stuff.h

Timestamp:

Feb 12, 2007, 10:54:22 AM (17 years ago)

Author:

Bruno Cornec

Message:

log_trace (unused) and log_trace_msg removed

File:

• branches/stable/mondo/src/include/my-stuff.h (modified) (5 diffs)

branches/stable/mondo/src/include/my-stuff.h

@@ -26 +26 @@
 #include <stdio.h>
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 #if !defined(bool) && !defined(__cplusplus)
@@ -100 +101 @@
  */
 #define MDSTAT_FILE "/proc/mdstat"
-
-/**
- * @bug Apparently unused.
- */
-#define MONDO_TRACEFILE "/var/log/mondo-tracefile.log"
 
 #undef assert
@@ -245 +241 @@
  * Log the file, line, Mondo error message, and OS error message (errno).
  */
-#define log_OS_error(x) {log_msg(0, "%s, line %ld: %s (%s)", __FILE__, __LINE__, x, strerror(errno));}
+#define log_OS_error(x) {mr_msg(1, "%s, line %ld: %s (%s)", __FILE__, __LINE__, x, strerror(errno));}
 
 /**
@@ -255 +251 @@
  * close() @p x and log a message if it fails.
  */
-#define paranoid_close(x) {if(close(x)) {log_msg(5, "close err");} x=-999; }
+#define paranoid_close(x) {if(close(x)) {mr_msg(5, "close err");} x=-999; }
 
 /**
  * fclose() @p x and log a message if it fails.
  */
-#define paranoid_fclose(x) {if(fclose(x)) {log_msg(5, "fclose err");} x=NULL; }
+#define paranoid_fclose(x) {if(fclose(x)) {mr_msg(5, "fclose err");} x=NULL; }
 
 /**
  * pclose() @p x and log a message if it fails.
  */
-#define paranoid_pclose(x) {if(pclose(x)) {log_msg(5, "pclose err");} x=NULL; }
+#define paranoid_pclose(x) {if(pclose(x)) {mr_msg(5, "pclose err");} x=NULL; }
 
 /**
  * Run the command @p x and log it if it fails.
  */
-#define paranoid_system(x) {if(system(x)) log_msg(4, x); }
+#define paranoid_system(x) {if(system(x)) mr_msg(4, x); }
 
 /**
@@ -354 +350 @@
 
 /**
- * Compatibility define to change log_it() calls to log_debug_msg() calls.
- */
-#define log_it(format, args...) log_debug_msg(2, __FILE__, __FUNCTION__, __LINE__, format, ## args)
-
-/**
- * Macro to log a message along with file, line, and function information.
- */
-#define log_msg(level, format, args...) log_debug_msg(level, __FILE__, __FUNCTION__, __LINE__, format, ## args)
+ * Shorter log command
+ */
+#define log_it(format, args...) mr_msg(2, format, ## args)
 
 #define DEFAULT_DVD_DISK_SIZE 4380  ///< The default size (in MB) of a DVD disk, unless the user says otherwise.