Changeset 1081 in MondoRescue for trunk/mondo/src/common/libmondo-stream.c

Timestamp:

Jan 28, 2007, 11:20:07 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1078:1080 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-stream.c (modified) (10 diffs)

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

@@ -13 +13 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -106 +107 @@
     int i;
 
-    blk = (char *) malloc(256 * 1024);
+    blk = (char *) mr_malloc(256 * 1024);
 
     log_it("closein_tape() -- entering");
@@ -153 +154 @@
     char *blk;
 
-    blk = (char *) malloc(256 * 1024);
+    blk = (char *) mr_malloc(256 * 1024);
 
     sleep(1);
@@ -624 +625 @@
 
     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;
@@ -658 +657 @@
         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++) {
@@ -726 +722 @@
     /*  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 */
@@ -759 +753 @@
         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;
@@ -872 +864 @@
 
     /*@ init  ******************************************************* */
-    datablock = malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(TAPE_BLOCK_SIZE);
     crc16 = 0;
     crctt = 0;
@@ -1003 +995 @@
     /*@ 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++) {
@@ -1142 +1134 @@
     long bytes_to_write;
 
-    datablock = malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(TAPE_BLOCK_SIZE);
     pB = strrchr(the_file_I_was_reading, '/');
     if (pB) {