Changeset 1086 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Feb 2, 2007, 11:21:27 PM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

File:

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

trunk/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -57 +57 @@
             insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
         } else {
-            log_msg(2, "No CD's left. No biggiefiles left. No problem.");
+            mr_msg(2, "No CD's left. No biggiefiles left. No problem.");
             return (0);
         }
@@ -77 +77 @@
     mr_asprintf(&bigfile_fname, biggiestruct.filename);
 
-    log_msg(2, "biggiestruct.filename = %s", bigfile_fname);
-    log_msg(2, "biggiestruct.checksum = %s", checksum);
+    mr_msg(2, "biggiestruct.filename = %s", bigfile_fname);
+    mr_msg(2, "biggiestruct.checksum = %s", checksum);
 
     if (!g_text_mode) {
@@ -88 +88 @@
     /* BERLIOS: Useless ?
     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, "/dev/", 5)) {
-        log_msg(2, _("Ignoring device %s"), bigfile_fname);
+        mr_msg(2, _("Ignoring device %s"), bigfile_fname);
         return(0);
     } else {
@@ -98 +98 @@
                 MNT_RESTORING, bigfile_fname);
     }
-    log_msg(2, command);
+    mr_msg(2, command);
     paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
     if (system(command)) {
@@ -108 +108 @@
         mr_free(command);
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            mr_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
             mr_free(bigfile_fname);
             return (1);
@@ -124 +124 @@
     }
     if (!strcmp(checksum, original_cksum) != 0) {
-        log_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
-    } else {
-        log_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
+        mr_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
+    } else {
+        mr_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
         retval++;
     }
@@ -162 +162 @@
 
     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);
@@ -171 +171 @@
     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);
     }
@@ -183 +183 @@
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
         mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         update_progress_form(tmp);
         mr_free(tmp);
@@ -322 +322 @@
                 "Differences found while processing fileset #%d       ",
                 current_tarball_number);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         mr_free(tmp);
     }
@@ -402 +402 @@
                        "/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...");
                 mr_free(tarball_fname);
                 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++;
             mr_free(progress_str);
@@ -590 +590 @@
             mr_free(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 {
@@ -650 +650 @@
     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()");
     }