Changeset 1080 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /***************************************************************************
-mondo-rstr-newt.c  -  description
------------------
-
-begin: Fri Apr 19 16:40:35 EDT 2002
-copyright : (C) 2002 Mondo  Hugo Rabson
-email     : Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit 4/2002
-email     : troff@nakedsoul.org
-cvsid     : $Id$
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* mondo-rstr-newt.c               Hugo Rabson
-
-
-07/12
-- wider mountlist entry editor window
-
-03/28/2004
-- removed g_mountlist_fname
-
-07/02/2003
-- fixed calls to popup_and_get_string()
-
-06/05
-- cleaned up get_isodir_info()
-
-05/02
-- added strip_path() to improve file list display for long paths (Conor)
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/08/2003
-- commented out call to sort_mountlist_by_device(), just in case it's 
-  futzing with LVM/RAID users
-
-08/21/2002
-- fix MOUNTLIST_FNAME and RAIDTAB_FNAME if Reload button finds them empty
-
-08/19
-- fixed what_number_cd_is_this() to take bkpinfo as parameter
-
-07/01 - 07/31
-- renamed from mondo-newt.c to mondo-rstr-newt.c
-- moved lots of subroutines to libmondo-newt.c
-- added hooks to libmondo
-- better handling of yes/no/YES/NO
-- better "% done" feedback (Philippe de Muyter)
-
-05/01 - 06/30
-- trim trailing \n from fgets() in a couple of functions
-- expanded "May I write mountlist?" message
-- replace scanf() with a properly restricted fgets() (Troff)
-
-02/01 - 02/28/2002
-- allow up to 50 chars in popup_and_get_string()'s input field
-- if g_current_progress > g_maximum_progress then g_current_progress=g_max...
-  to stop the progress bar from shooting off the RHS of the screen :)
-- beefed up the RAID-related logging a bit
-- don't complain if partition format is a number (1-255)
-- if hard disk does not exist then warn user when editing mountlist
-- when running 'eject -t', log its output
-
-[...]
-
-08/09/2001
-- created
+ * $Id$
 */
+
+#include "mr_mem.h"
 
 
@@ -1650 +1578 @@
     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");
@@ -1727 +1653 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
-    paranoid_free(title_of_editraidForm_window);
-    paranoid_free(sz_raid_level);
-    paranoid_free(sz_data_disks);
-    paranoid_free(sz_spare_disks);
-    paranoid_free(sz_parity_disks);
-    paranoid_free(sz_failed_disks);
-    paranoid_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);
 #endif
 }
@@ -1781 +1707 @@
     struct mountlist_itself *unallocparts;
 
-    unallocparts = malloc(sizeof(struct mountlist_itself));
+    unallocparts = mr_malloc(sizeof(struct mountlist_itself));
 
     log_it("Started edit_raidlist_entry");
@@ -2816 +2742 @@
     malloc_string(sz_res);
     malloc_string(header_text);
-    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,
@@ -2920 +2836 @@
                sizeof(struct list_of_disks));
     }
-    paranoid_free(tmp);
-    paranoid_free(help_text);
-    paranoid_free(title_of_window);
-    paranoid_free(sz_res);
-    paranoid_free(header_text);
-    paranoid_free(bkp_raidrec);
-    paranoid_free(bkp_disklist);
-    paranoid_free(bkp_raidlist);
-    paranoid_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);
 }
 #endif