Changeset 1086 in MondoRescue for trunk/mondo/src/common/libmondo-stream.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/common/libmondo-stream.c (modified) (18 diffs)

trunk/mondo/src/common/libmondo-stream.c

@@ -363 +363 @@
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
-        log_msg(1, "Got xattr");
+        mr_msg(1, "Got xattr");
     }
     mr_free(fname);
@@ -390 +390 @@
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
         }
-        log_msg(1, "Got acl");
+        mr_msg(1, "Got acl");
     }
     mr_free(fname);
@@ -408 +408 @@
     // tarball itself
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    log_msg(1, "now looking for afioball");
+    mr_msg(1, "now looking for afioball");
     return (retval);
 }
@@ -580 +580 @@
 
     if (strncmp(tapedev, "/dev/", 5)) {
-        log_msg(1,
+        mr_msg(1,
                 "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
@@ -910 +910 @@
 //    crctt=crc16=0;
             where_I_was_before_tape_change = size;
-            log_msg(4, "where_I_was_... = %lld",
+            mr_msg(4, "where_I_was_... = %lld",
                     where_I_was_before_tape_change);
             start_to_read_from_next_tape(bkpinfo);
-            log_msg(4, "Started reading from next tape.");
+            mr_msg(4, "Started reading from next tape.");
             skip_incoming_files_until_we_find_this_one(temp_fname);
-            log_msg(4, "Skipped irrelevant files OK.");
+            mr_msg(4, "Skipped irrelevant files OK.");
             for (size = orig_size; size > where_I_was_before_tape_change;
                  size -= bytes_to_write) {
@@ -921 +921 @@
                     fread(datablock, 1, bytes_to_read, g_tape_stream);
             }
-            log_msg(4, "'size' is now %lld (should be %lld)", size,
+            mr_msg(4, "'size' is now %lld (should be %lld)", size,
                     where_I_was_before_tape_change);
             log_to_screen("Successfully re-sync'd tape");
@@ -938 +938 @@
 #endif
     }
-    log_msg(6, "Total read from tape for this file = %lld",
+    mr_msg(6, "Total read from tape for this file = %lld",
             total_read_from_tape_for_this_file);
-    log_msg(6, ".......................... Should be %lld", orig_size);
+    mr_msg(6, ".......................... Should be %lld", orig_size);
     g_tape_posK += total_read_from_tape_for_this_file / 1024;
     mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
@@ -1027 +1027 @@
     }
     tempblock[i] = '\0';
-    log_msg(6, "%s (fname=%s, size=%ld K)",
+    mr_msg(6, "%s (fname=%s, size=%ld K)",
             marker_to_string(*pcontrol_char), tempblock + 1000,
             (long) (*plen) >> 10);
@@ -1141 +1141 @@
         pB = the_file_I_was_reading;
     }
-    log_msg(1, "skip_incoming_..(%s)", pB);
-    log_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");
+    mr_msg(1, "skip_incoming_..(%s)", pB);
+    mr_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");
     ctrl_chr = -1;
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
@@ -1151 +1151 @@
             break;
         }
-        log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
+        mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
         wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
-        log_msg(3, "Still trying to re-sync w/ tape");
+        mr_msg(3, "Still trying to re-sync w/ tape");
         mr_free(temp_fname);
         temp_fname = (char *)&res;
@@ -1164 +1164 @@
             break;
         }
-        log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
+        mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
         wrong_marker(BLK_START_FILE, ctrl_chr);
-        log_msg(3, "Still trying to re-sync w/ tape");
+        mr_msg(3, "Still trying to re-sync w/ tape");
         /* Do not desallocate when the while condition is met */
         if (ctrl_chr != BLK_START_FILE) {
@@ -1186 +1186 @@
     }
     while (strcmp(pA, pB)) {
-        log_msg(6, "Skipping %s (it's not %s)", temp_fname,
+        mr_msg(6, "Skipping %s (it's not %s)", temp_fname,
                 the_file_I_was_reading);
         for (size = temp_size; size > 0; size -= bytes_to_write) {
@@ -1230 +1230 @@
          */
     }
-    log_msg(2, "Reading %s (it matches %s)", temp_fname,
+    mr_msg(2, "Reading %s (it matches %s)", temp_fname,
             the_file_I_was_reading);
     mr_free(temp_fname);
@@ -1275 +1275 @@
         wrong_marker(BLK_START_OF_BACKUP, ctrlchr);
     } else {
-        log_msg(3, "Next tape opened OK. Whoopee!");
+        mr_msg(3, "Next tape opened OK. Whoopee!");
     }
     return (res);
@@ -1350 +1350 @@
     char *fname;
 
-    log_msg(2, "I am now writing back catalog to tape");
+    mr_msg(2, "I am now writing back catalog to tape");
     last = g_tapecatalog->entries - 1;
     for (i = 0; i <= last; i++) {
@@ -1356 +1356 @@
                  g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
-            log_msg(6, "Can't write %s - it doesn't exist.", fname);
+            mr_msg(6, "Can't write %s - it doesn't exist.", fname);
         } else {
             write_header_block_to_stream(length_of_file(fname),
                                          "start-backcatalog-afio-or-slice",
                                          BLK_START_AN_AFIO_OR_SLICE);
-            log_msg(2, "Writing %s", fname);
+            mr_msg(2, "Writing %s", fname);
             if (write_file_to_stream_from_file(bkpinfo, fname)) {
                 res++;
-                log_msg(2, "%s failed", fname);
+                mr_msg(2, "%s failed", fname);
             }
             if (i != last) {
@@ -1374 +1374 @@
         mr_free(fname);
     }
-    log_msg(2, "Finished writing back catalog to tape");
+    mr_msg(2, "Finished writing back catalog to tape");
     return (res);
 }
@@ -1606 +1606 @@
              marker_to_string(control_char), p,
              (long) length_of_incoming_file >> 10);
-    log_msg(6, tmp);
+    mr_msg(6, tmp);
     mr_free(tmp);
     return (0);