Changeset 1084 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Jan 29, 2007, 11:51:36 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fixes to allow trunk to build under rpm format at least

File:

• trunk/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (3 diffs)

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

@@ -1733 +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
 }
@@ -1794 +1784 @@
     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");
@@ -2927 +2912 @@
                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