Changeset 2313 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Aug 18, 2009, 2:29:11 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3324@localhost: bruno | 2009-07-31 23:42:57 +0200
percent_media_full_comment now allocates memory

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1588 +1588 @@
     malloc_string(sz_parity_disks);
     malloc_string(sz_failed_disks);
-    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");
 
-    memcpy((void *) bkp_raidrec, (void *) raidrec,
-           sizeof(struct raid_device_record));
+    memcpy((void *) bkp_raidrec, (void *) raidrec, sizeof(struct raid_device_record));
     sprintf(title_of_editraidForm_window, "%s", raidrec->raid_device);
     log_msg(2, "Opening newt window");
@@ -1637 +1634 @@
             choose_raid_level(raidrec);
         } else if (b_res == bSelectData) {
-            select_raid_disks(mountlist, raidlist, raidrec, "data",
-                              &raidrec->data_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "data", &raidrec->data_disks);
         } else if (b_res == bSelectSpare) {
-            select_raid_disks(mountlist, raidlist, raidrec, "spare",
-                              &raidrec->spare_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "spare", &raidrec->spare_disks);
         } else if (b_res == bSelectParity) {
-            select_raid_disks(mountlist, raidlist, raidrec, "parity",
-                              &raidrec->parity_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "parity", &raidrec->parity_disks);
         } else if (b_res == bSelectFailed) {
-            select_raid_disks(mountlist, raidlist, raidrec, "failed",
-                              &raidrec->failed_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "failed", &raidrec->failed_disks);
         } else if (b_res == bAdditional) {
             edit_raidrec_additional_vars(raidrec);
@@ -1657 +1650 @@
     }
     if (b_res == bCancel) {
-        memcpy((void *) raidrec, (void *) bkp_raidrec,
-               sizeof(struct raid_device_record));
+        memcpy((void *) raidrec, (void *) bkp_raidrec, sizeof(struct raid_device_record));
     }
     newtPopHelpLine();
     newtPopWindow();
-    mountlist->el[currline].size =
-        calculate_raid_device_size(mountlist, raidlist,
-                                   raidrec->raid_device);
+    mountlist->el[currline].size = calculate_raid_device_size(mountlist, raidlist, raidrec->raid_device);
     paranoid_free(title_of_editraidForm_window);
     paranoid_free(sz_raid_level);
@@ -1873 +1863 @@
 
 if (b_res == bCancel) {
-    memcpy((void *) raidrec, (void *) &bkp_raidrec,
-           sizeof(struct vinum_plex));
+    memcpy((void *) raidrec, (void *) &bkp_raidrec, sizeof(struct vinum_plex));
 }
 newtPopWindow();