Changeset 1144 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

log_trace (unused) and log_trace_msg removed

Location:

branches/stable/mondo/src

Files:

• common/libmondo-tools-EXT.h (modified) (2 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• common/libmondo-tools.h (modified) (2 diffs)
• include/my-stuff.h (modified) (5 diffs)

branches/stable/mondo/src/common/libmondo-tools-EXT.h

@@ -6 +6 @@
 extern void clean_up_KDE_desktop_if_necessary(void);
 extern long get_time(void);
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
-                              const char *szFunction, int nLine,
-                              const char *fmt, ...);
-extern void standard_log_debug_msg(int debug_level, const char *szFile,
-                                   const char *szFunction, int nLine,
-                                   const char *fmt, ...);
 extern int read_cfg_var(char *config_file, char *label, char *value);
 extern int write_cfg_var(char *config_file, char *label, char *value);
@@ -20 +14 @@
 extern void initialize_raidrec(struct raid_device_record *raidrec);
 #endif
-extern void log_trace(char *o);
 extern int some_basic_system_sanity_checks(void);
 

branches/stable/mondo/src/common/libmondo-tools.c

@@ -314 +314 @@
 #endif
 }
-
-
-/**
- * Log a trace message to the trace file.
- * @bug This function seems orphaned. Please remove.
- */
-void log_trace(char *o)
-{
-    /*@ pointers **************************************************** */
-    FILE *fout;
-
-    /*@ buffers ***************************************************** */
-    char output[MAX_STR_LEN];
-
-    /*@ int    ****************************************************** */
-    int i;
-
-    /*@ end vars *************************************************** */
-
-    if (o[0] == '\0') {
-        return;
-    }
-    strcpy(output, o);
-    i = (int) strlen(output);
-    if (i <= 0) {
-        return;
-    }
-    if (output[i - 1] < 32) {
-        output[i - 1] = '\0';
-    }
-    if (g_text_mode
-        /* && !strstr(last_line_of_file(MONDO_LOGFILE),output) */ ) {
-        printf("%s\n", output);
-    }
-
-    fout = fopen(MONDO_TRACEFILE, "a");
-    if (fout) {
-        fprintf(fout, "%s\n", output);
-        paranoid_fclose(fout);
-    } else {
-        log_OS_error("Cannot write to tracefile");
-    }
-}
-
-
-
 
 
@@ -1334 +1288 @@
 
 /**
- * The standard log_debug_msg() (mr_msg() also due to a macro). Writes some describing
- * information to the logfile.
- */
-void standard_log_debug_msg(int debug_level, const char *szFile,
-                            const char *szFunction, int nLine,
-                            const char *fmt, ...)
-{
-    va_list args;
-    int i;
-    static int depth = 0;
-    char *tmp;
-    FILE *fout;
-
-    if (depth > 5) {
-        depth--;
-        return;
-    }
-    depth++;
-
-    malloc_string(tmp);
-
-    if (debug_level <= g_loglevel) {
-        va_start(args, fmt);
-        if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
-            return;
-        }                       // fatal_error("Failed to openout to logfile - sheesh..."); }
-
-        // add tabs to distinguish log levels
-        if (debug_level > 0) {
-            for (i = 1; i < debug_level; i++)
-                fprintf(fout, "\t");
-            if (getpid() == g_main_pid)
-                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction,
-                        nLine);
-            else if (getpid() == g_buffer_pid && g_buffer_pid > 0)
-                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction,
-                        nLine);
-            else
-                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile,
-                        szFunction, nLine);
-        }
-        vfprintf(fout, fmt, args);
-
-        // do not slow down the progran if standard debug level
-        // must be enabled: if no flush, the log won't be up-to-date if there
-        // is a segfault
-        //if (g_dwDebugLevel != 1)
-
-        va_end(args);
-        fprintf(fout, "\n");
-        paranoid_fclose(fout);
-    }
-    depth--;
-    mr_free(tmp);
-}
-
-/**
- * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
- */
-void (*log_debug_msg) (int, const char *, const char *, int, const char *,
-                       ...) = standard_log_debug_msg;
-
-
-/**
  * If @p y, malloc @p x, else free @p x.
  * @bug This function seems orphaned. Please remove.
@@ -1426 +1316 @@
         mr_free(g_magicdev_command);
     }
-
-    /*
-       char**list_of_arrays[] = {
-       &g_boot_mountpt,
-       &g_mondo_home,
-       &g_tmpfs_mountpt,
-       &g_erase_tmpdir_and_scratchdir,
-       &g_serial_string,
-       &g_magicdev_command,
-       NULL};
-
-       char**ppcurr;
-       int i;
-
-       for(i=0;list_of_arrays[i];i++)
-       {
-       mr_msg(5, "Allocating %d", i);
-       ppcurr = list_of_arrays[i];
-       if (mal)
-       { *ppcurr = malloc(MAX_STR_LEN); }
-       else
-       {
-       if (*ppcurr)
-       {
-       free(*ppcurr);
-       }
-       }
-       }
-       mr_msg(5, "Returning");
-     */
 }
 

branches/stable/mondo/src/common/libmondo-tools.h

@@ -9 +9 @@
 
 long get_time(void);
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
-                              const char *szFunction, int nLine,
-                              const char *fmt, ...);
-void standard_log_debug_msg(int debug_level, const char *szFile,
-                            const char *szFunction, int nLine,
-                            const char *fmt, ...);
 int read_cfg_var(char *config_file, char *label, char *value);
 int write_cfg_var(char *config_file, char *label, char *value);
@@ -23 +17 @@
 void initialize_raidrec(struct raid_device_record *raidrec);
 #endif
-void log_trace(char *o);
 int some_basic_system_sanity_checks(void);
 

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.