Changeset 1625 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c

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

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (11 diffs)

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]);