Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-stream.c

Timestamp:

Aug 18, 2009, 3:13:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3335@localhost: bruno | 2009-08-08 23:04:12 +0200

• Change mr_asprintf to avoid the need of pointer and be consistent with the other mr_mem functions

File:

• branches/2.2.10/mondo/src/common/libmondo-stream.c (modified) (11 diffs)

branches/2.2.10/mondo/src/common/libmondo-stream.c

@@ -1012 +1012 @@
 {
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
     char *datablock;
     char *temp_fname;
     char *temp_cksum;
     char *actual_cksum = NULL;
-//  char *pA, *pB;
 
     /*@ int ********************************************************* */
@@ -1058 +1056 @@
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
     if (orig_size != temp_size && orig_size != -1) {
-        mr_asprintf(tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
     }
     if (ctrl_chr != BLK_START_FILE) {
@@ -1131 +1127 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        mr_asprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
-        mr_asprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
+        log_to_screen("actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
+        log_to_screen("%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
         retval++;
     }
@@ -1573 +1563 @@
     /*@ pointers *************************************************** */
     FILE *fin;
-    char *tmp = NULL;
 
     /*@ long ******************************************************* */
@@ -1591 +1580 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        mr_asprintf(tmp, "Cannot find %s", fname);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Cannot find %s", fname);
         return (1);
     }
@@ -1636 +1623 @@
 {
     /*@ buffers **************************************************** */
-    char *tmp = NULL;
     char datablock[TAPE_BLOCK_SIZE];
     char *checksum = NULL;
@@ -1689 +1675 @@
         p++;
     }
-    mr_asprintf(tmp, "Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
     write_header_block_to_stream(filesize, infile_basename,
                                  BLK_START_FILE);
@@ -1761 +1745 @@
     /*@ buffers **************************************************** */
     char tempblock[TAPE_BLOCK_SIZE];
-    char *tmp = NULL;
     char *p;
 
@@ -1780 +1763 @@
     }
     if (!g_tape_stream) {
-        log_to_screen
-            ("You're not backing up to tape. Why write a tape header?");
+        log_to_screen("You're not backing up to tape. Why write a tape header?");
         return (1);
     }
@@ -1791 +1773 @@
     memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
     strcpy(tempblock + 1000, filename);
-    g_tape_posK +=
-        fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
-               g_tape_stream) / 1024;
-    mr_asprintf(tmp, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
-    log_msg(6, tmp);
-    mr_free(tmp);
+    g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
+    log_msg(6, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
     return (0);
 }
@@ -1816 +1794 @@
 void wrong_marker(int should_be, int it_is)
 {
-    /*@ buffer ***************************************************** */
-    char *tmp = NULL;
-
-
-    /*@ end vars *************************************************** */
-    mr_asprintf(tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
 }