Changeset 1625 in MondoRescue

Timestamp:

Sep 9, 2007, 1:00:49 AM (17 years ago)

Author:

Bruno Cornec

Message:

remove g_loglevel and replaced with mr_conf->log_level

Location:

branches/stable/mondo/src

Files:

• common/libmondo-fork.c (modified) (4 diffs)
• common/libmondo-tools-EXT.h (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• include/my-stuff.h (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (3 diffs)
• mondoarchive/mondoarchive.c (modified) (8 diffs)
• mondorestore/mondorestore.c (modified) (11 diffs)

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

@@ -7 +7 @@
 #include "mr_str.h"
 #include "mr_gettext.h"
+#include "mr_conf.h"
 
 #include "mondostructures.h"
@@ -23 +24 @@
 extern char *MONDO_LOGFILE;
 pid_t g_buffer_pid = 0;
-
+extern struct mr_ar_conf *mr_conf = NULL;
 
 /**
@@ -178 +179 @@
  * Run a program and log its output (stdout and stderr) to the logfile.
  * @param program The program to run. Passed to the shell, so you can use pipes etc.
- * @param debug_level If @p g_loglevel is higher than this, do not log the output.
+ * @param debug_level If @p log_level is higher than this, do not log the output.
  * @return The exit code of @p program (depends on the command, but 0 almost always indicates success).
  */
@@ -205 +206 @@
     }
 
-    if (debug_level <= g_loglevel) {
+    if (debug_level <= mr_conf->log_level) {
         log_if_success = TRUE;
         log_if_failure = TRUE;

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

@@ -15 +15 @@
 #endif
 extern int some_basic_system_sanity_checks(void);
-
-
-extern int g_loglevel;
 
 

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

@@ -64 +64 @@
 char *g_tmpfs_mountpt = NULL;
 char *g_magicdev_command = NULL;
-
-/**
- * The default maximum level to log messages at or below.
- */
-int g_loglevel = DEFAULT_DEBUG_LEVEL;
 
 /* @} - end of globalGroup */

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

@@ -294 +294 @@
 #define log_it(format, args...) mr_msg(2, format, ## args)
 
-#define DEFAULT_DEBUG_LEVEL 4   ///< By default, don't log messages with a loglevel higher than this.
-#define DEFAULT_MR_LOGLEVEL 4
-
 #define SZ_NTFSPROG_VOLSIZE "1048576"   // was 4096
 #define NTFSPROG_PARAMS "-z0 -V" SZ_NTFSPROG_VOLSIZE " -o -b -d -g1"

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -19 +19 @@
 #include "mr_msg.h"
 #include "mr_gettext.h"
+#include "mr_conf.h"
 
 //static char cvsid[] = "$Id$";
 
-extern int g_loglevel;
 extern bool g_text_mode;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
@@ -28 +28 @@
 extern char g_tmpfs_mountpt[MAX_STR_LEN];
 extern bool g_sigpipe;
+
+extern struct mr_ar_conf *mr_conf = NULL;
 
 /*@ file pointer **************************************************/
@@ -220 +222 @@
     }
     if (flag_set['K']) {
-        g_loglevel = atoi(flag_val['K']);
-        if (g_loglevel < 3) {
-            g_loglevel = 3;
+        mr_conf->log_level = atoi(flag_val['K']);
+        if (mr_conf->log_level < 3) {
+            mr_conf->log_level = 3;
         }
     }

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -49 +49 @@
 extern char *g_magicdev_command;
 extern t_bkptype g_backup_media_type;
-extern int g_loglevel;
 
 extern char *get_uname_m(void);
@@ -501 +500 @@
 
     if (argc == 4 && !strcmp(argv[1], "getfattr")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -513 +512 @@
     }
     if (argc == 4 && !strcmp(argv[1], "setfattr")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -520 +519 @@
 
     if (argc == 3 && !strcmp(argv[1], "wildcards")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -530 +529 @@
 
     if (argc == 4 && !strcmp(argv[1], "getfacl")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -542 +541 @@
     }
     if (argc == 4 && !strcmp(argv[1], "setfacl")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -549 +548 @@
 
     if (argc > 2 && !strcmp(argv[1], "find-cd")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -569 +568 @@
 
     if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         g_text_mode = TRUE;
         setup_newt_stuff();

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -32 +32 @@
 #include "mondo-rstr-tools-EXT.h"
 
+#define DEFAULT_MR_LOGLEVEL 4
+
 extern void twenty_seconds_til_yikes(void);
+extern struct mr_ar_conf *mr_conf = NULL;
 
 
@@ -1013 +1016 @@
     struct s_node *node = NULL;
 
-    old_loglevel = g_loglevel;
+    old_loglevel = mr_conf->log_level;
     ubuf = &the_utime_buf;
     assert(bkpinfo != NULL);
@@ -1076 +1079 @@
     if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
     {
-        g_loglevel = 4;
+        mr_conf->log_level = 4;
         use_ntfsprog_hack = TRUE;
         mr_msg(2,
@@ -1241 +1244 @@
     }
     paranoid_fclose(fout);
-    g_loglevel = old_loglevel;
+    mr_conf->log_level = old_loglevel;
 
     if (use_ntfsprog_hack) {
@@ -1317 +1320 @@
     ubuf = &the_utime_buf;
 
-    old_loglevel = g_loglevel;
+    old_loglevel = mr_conf->log_level;
     assert(bkpinfo != NULL);
     assert(orig_bf_fname != NULL);
@@ -1365 +1368 @@
 
     if (use_ntfsprog) {
-        g_loglevel = 4;
+        mr_conf->log_level = 4;
         mr_asprintf(&outfile_fname, orig_bf_fname);
         use_ntfsprog_hack = TRUE;
@@ -1507 +1510 @@
     }
 
-    g_loglevel = old_loglevel;
+    mr_conf->log_level = old_loglevel;
     return (retval);
 }
@@ -2817 +2820 @@
     }
 
-    g_loglevel = DEFAULT_MR_LOGLEVEL;
+    mr_conf->log_level = DEFAULT_MR_LOGLEVEL;
 
 /* Configure global variables */
@@ -2926 +2929 @@
     }
 
-    g_loglevel = DEFAULT_MR_LOGLEVEL;
+    mr_conf->log_level = DEFAULT_MR_LOGLEVEL;
     if (argc == 3 && strcmp(argv[1], "--echo-to-screen") == 0) {
         fout = fopen("/tmp/out.txt", "w");
@@ -2958 +2961 @@
 
     if (argc == 5 && strcmp(argv[1], "--common") == 0) {
-        g_loglevel = 6;
+        mr_conf->log_level = 6;
         filelist = load_filelist(argv[2]);
         if (!filelist) {
@@ -2986 +2989 @@
     if (argc == 5 && strcmp(argv[1], "--copy") == 0) {
         mr_msg(1, "SCORE");
-        g_loglevel = 10;
+        mr_conf->log_level = 10;
         if (strstr(argv[2], "save")) {
             mr_msg(1, "Saving from %s to %s", argv[3], argv[4]);