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

trunk/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1 +1 @@
 /***************************************************************************
  * $Id$
-**/
-
+*/
 
 /**
@@ -1652 +1651 @@
     assert(raidrec != NULL);
 
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
 
     log_it("Started edit_raidlist_entry");
@@ -1736 +1733 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
+<<<<<<< .courant
     mr_free(bkp_raidrec);
+=======
+    mr_free(title_of_editraidForm_window);
+    mr_free(sz_raid_level);
+    mr_free(sz_data_disks);
+    mr_free(sz_spare_disks);
+    mr_free(sz_parity_disks);
+    mr_free(sz_failed_disks);
+    mr_free(bkp_raidrec);
+>>>>>>> .fusion-droit.r1080
 #endif
 }
@@ -1787 +1794 @@
     struct mountlist_itself *unallocparts = NULL;
 
+<<<<<<< .courant
     /* BERLIOS: Check return value */
     unallocparts = malloc(sizeof(struct mountlist_itself));
+=======
+    unallocparts = mr_malloc(sizeof(struct mountlist_itself));
+>>>>>>> .fusion-droit.r1080
 
     log_it("Started edit_raidlist_entry");
@@ -2811 +2822 @@
 
     iamhere("malloc'ing");
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
-    if (!(bkp_disklist = malloc(sizeof(struct list_of_disks)))) {
-        fatal_error("Cannot malloc space for disklist");
-    }
-    if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc space for raidlist");
-    }
-    if (!
-        (unallocated_raid_partitions =
-         malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc space for unallocated_raid_partitions");
-    }
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
+    bkp_disklist = mr_malloc(sizeof(struct list_of_disks));
+    bkp_raidlist = mr_malloc(sizeof(struct raidlist_itself));
+    unallocated_raid_partitions = mr_malloc(sizeof(struct mountlist_itself));
 
     memcpy((void *) bkp_raidlist, (void *) raidlist,
@@ -2926 +2927 @@
                sizeof(struct list_of_disks));
     }
+<<<<<<< .courant
     mr_free(bkp_raidrec);
     mr_free(bkp_disklist);
     mr_free(bkp_raidlist);
     mr_free(unallocated_raid_partitions);
+=======
+    mr_free(tmp);
+    mr_free(help_text);
+    mr_free(title_of_window);
+    mr_free(sz_res);
+    mr_free(header_text);
+    mr_free(bkp_raidrec);
+    mr_free(bkp_disklist);
+    mr_free(bkp_raidlist);
+    mr_free(unallocated_raid_partitions);
+>>>>>>> .fusion-droit.r1080
 }
 #endif