Changeset 1108 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Feb 8, 2007, 12:10:16 AM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg for main files

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (13 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -78 +78 @@
             sprintf(tmp_ptr,
                     "No CD's left. No biggiefiles left. No prob, Bob.");
-            log_msg(2, tmp_ptr);
+            mr_msg(2, tmp_ptr);
             return (0);
         }
@@ -95 +95 @@
     strcpy(bigfile_fname_ptr, biggiestruct.filename);
 
-    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
-    log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
+    mr_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
+    mr_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
     sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
@@ -105 +105 @@
     }
     if (!checksum[0]) {
-        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
+        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
     }
     if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
@@ -114 +114 @@
                 MNT_RESTORING, bigfile_fname_ptr);
     }
-    log_msg(2, command_ptr);
+    mr_msg(2, command_ptr);
     paranoid_system
         ("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
@@ -123 +123 @@
     } else {
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2,
+            mr_msg(2,
                     "Unable to open /tmp/md5sum.txt; can't get live checksum");
             original_cksum[0] = '\0';
@@ -147 +147 @@
         retval++;
     }
-    log_msg(1, tmp_ptr);
+    mr_msg(1, tmp_ptr);
     if (retval) {
         if (!(fout = fopen("/tmp/changed.txt", "a"))) {
@@ -188 +188 @@
 
     assert(bkpinfo != NULL);
-    log_msg(1, "Comparing biggiefiles");
+    mr_msg(1, "Comparing biggiefiles");
 
     if (length_of_file(BIGGIELIST) < 6) {
-        log_msg(1,
+        mr_msg(1,
                 "OK, really teeny-tiny biggielist; not comparing biggiefiles");
         return (0);
@@ -197 +197 @@
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
+        mr_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
         return (0);
     }
@@ -208 +208 @@
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
         sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         update_progress_form(tmp);
         res = compare_a_biggiefile(bkpinfo, bigfileno);
@@ -341 +341 @@
                 "Differences found while processing fileset #%d       ",
                 current_tarball_number);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
     }
     unlink(logfile);
@@ -421 +421 @@
                        "/archives/slice* > /dev/null 2> /dev/null")
                 == 0) {
-                log_msg(2, "OK, I think I'm done with tarballs...");
+                mr_msg(2, "OK, I think I'm done with tarballs...");
                 break;
             }
-            log_msg(2, "OK, I think it's time for another CD...");
+            mr_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
             sprintf(progress_str, "Comparing with %s #%d ",
@@ -603 +603 @@
             log_to_screen(tmp);
 
-            log_msg(2, "calling popup_changelist_from_file()");
+            mr_msg(2, "calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
-            log_msg(2, "Returning from popup_changelist_from_file()");
+            mr_msg(2, "Returning from popup_changelist_from_file()");
         }
     } else {
@@ -658 +658 @@
     if (length_of_file("/tmp/changed.txt") > 2
         && length_of_file("/tmp/changed.files") > 2) {
-        log_msg(0,
+        mr_msg(0,
                 "Type 'less /tmp/changed.files' to see which files don't match the archives");
-        log_msg(2, "Calling popup_changelist_from_file()");
+        mr_msg(2, "Calling popup_changelist_from_file()");
         popup_changelist_from_file("/tmp/changed.files");
-        log_msg(2, "Returned from popup_changelist_from_file()");
+        mr_msg(2, "Returned from popup_changelist_from_file()");
     }