Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (20 diffs)

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

@@ -13 +13 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -111 +112 @@
     int i;
 
-    blk = (char *) malloc(256 * 1024);
+    blk = (char *) mr_malloc(256 * 1024);
 
     log_it("closein_tape() -- entering");
@@ -141 +142 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(blk);
-    paranoid_free(g_tapecatalog);
+    mr_free(blk);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -170 +171 @@
     char *blk;
 
-    blk = (char *) malloc(256 * 1024);
+    blk = (char *) mr_malloc(256 * 1024);
 
     sleep(1);
@@ -218 +219 @@
     //  if (!bkpinfo->please_dont_eject)
     //    { eject_device(bkpinfo->media_device); }
-    paranoid_free(blk);
-    paranoid_free(g_tapecatalog);
+    mr_free(blk);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -233 +234 @@
     sprintf(command, "mt -f %s status", dev);
     res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -596 +597 @@
     sprintf(tmp, "mt -f %s setblk %ld", tapedev, internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -636 +637 @@
 
     assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
@@ -672 +671 @@
         return (-1);
     }
-    if (!(datablock = (char *) malloc(256 * 1024))) {
-        log_to_screen("Unable to malloc 256*1024");
-        exit(1);
-    }
+    datablock = (char *) mr_malloc(256 * 1024);
     for (i = 0; i < 32; i++) {
         for (j = 0; j < 4; j++) {
@@ -692 +688 @@
     }
     paranoid_fclose(fout);
-    paranoid_free(datablock);
+    mr_free(datablock);
 /* find initial blocks */
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
@@ -738 +734 @@
 /*  initialise the catalog */
     g_current_media_number = 1;
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
 /* log stuff */
@@ -771 +765 @@
         return (0);
     }
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
@@ -898 +890 @@
     malloc_string(temp_cksum);
     malloc_string(actual_cksum);
-    datablock = malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(TAPE_BLOCK_SIZE);
     crc16 = 0;
     crctt = 0;
@@ -995 +987 @@
         /*      log_it(tmp); */
     }
-    paranoid_free(datablock);
-    paranoid_free(tmp);
-    paranoid_free(temp_fname);
-    paranoid_free(temp_cksum);
-    paranoid_free(actual_cksum);
+    mr_free(datablock);
+    mr_free(tmp);
+    mr_free(temp_fname);
+    mr_free(temp_cksum);
+    mr_free(actual_cksum);
     return (retval);
 }
@@ -1028 +1020 @@
     /*@ end vars *************************************************** */
 
-    tempblock = (char *) malloc((size_t) TAPE_BLOCK_SIZE);
+    tempblock = (char *) mr_malloc((size_t) TAPE_BLOCK_SIZE);
 
     for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) {
@@ -1065 +1057 @@
             marker_to_string(*pcontrol_char), tempblock + 1000,
             (long) (*plen) >> 10);
-    paranoid_free(tempblock);
+    mr_free(tempblock);
     return (retval);
 }
@@ -1172 +1164 @@
     long bytes_to_write;
 
-    datablock = malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(TAPE_BLOCK_SIZE);
     malloc_string(temp_fname);
     pB = strrchr(the_file_I_was_reading, '/');
@@ -1265 +1257 @@
     log_msg(2, "Reading %s (it matches %s)", temp_fname,
             the_file_I_was_reading);
-    paranoid_free(temp_fname);
-    paranoid_free(datablock);
+    mr_free(temp_fname);
+    mr_free(datablock);
     return (0);
 }
@@ -1313 +1305 @@
         log_msg(3, "Next tape opened OK. Whoopee!");
     }
-    paranoid_free(sz_msg);
+    mr_free(sz_msg);
     return (res);
 }
@@ -1413 +1405 @@
         }
     }
-    paranoid_free(fname);
+    mr_free(fname);
     log_msg(2, "Finished writing back catalog to tape");
     return (res);