Changeset 1081 in MondoRescue for trunk/mondo/src/mondorestore/mondo-restore.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/mondorestore/mondo-restore.c (modified) (6 diffs)

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -1 +1 @@
 /***************************************************************************
-$Id$
-restores mondoarchive data
+* restores mondoarchive data
+* $Id$
 ***************************************************************************/
 
@@ -910 +910 @@
     assert(bkpinfo != NULL);
 
-    mountlist = malloc(sizeof(struct mountlist_itself));
-    raidlist = malloc(sizeof(struct raidlist_itself));
-
-    if (!mountlist || !raidlist) {
-        fatal_error("Cannot malloc() mountlist and/or raidlist");
-    }
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     mr_allocstr(bkpinfo->restore_path, "/");
@@ -964 +960 @@
         eject_device(bkpinfo->media_device);
     }
-    free(mountlist);
-    free(raidlist);
+    mr_free(mountlist);
+    mr_free(raidlist);
     return (retval);
 }
@@ -1029 +1025 @@
     assert(bkpinfo != NULL);
 
-    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
-        fatal_error("Cannot malloc bigblk");
-    }
+    bigblk = mr_malloc(TAPE_BLOCK_SIZE);
 
     tmp = slice_fname(bigfileno, 0, ARCHIVES_PATH, "");
@@ -1751 +1745 @@
     mr_free(acl_fname);
     mr_free(temp_log);
-
     log_msg(5, "Leaving");
     return (retval);
@@ -2876 +2869 @@
     mr_free(tmp);
 
-    if (!
-        (bkpinfo = g_bkpinfo_DONTUSETHIS =
-         malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
-    if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc mountlist");
-    }
-    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc raidlist");
-    }
+    bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo));
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     malloc_libmondo_global_strings();