Changeset 2405 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 17, 2009, 3:45:24 AM (15 years ago)

Author:

Bruno Cornec

Message:

Removes some malloc_string static allocation

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (8 diffs)

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

@@ -698 +698 @@
 t_bkptype media_specified_by_user;
 
-malloc_string(tmp);
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
 assert(bkpinfo != NULL);
@@ -1099 +1098 @@
 g_backup_media_type = bkpinfo->backup_media_type;
 paranoid_free(value);
-paranoid_free(tmp);
 return (0);
 
@@ -1499 +1497 @@
     char *command = NULL;
     char *boot_device = NULL;
-    char *rootdev;
-    char *rootdrive;
-    char *conffile;
     char *tmp = NULL;
     char *editor = NULL;
@@ -1509 +1504 @@
     bool done;
 
-    malloc_string(rootdev);
-    malloc_string(rootdrive);
-    malloc_string(conffile);
     assert_string_is_neither_NULL_nor_zerolength(bd);
     mr_asprintf(boot_device, "%s", bd);
@@ -1617 +1609 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(rootdev);
-    paranoid_free(rootdrive);
-    paranoid_free(conffile);
 
     return (res);
@@ -2190 +2179 @@
 
    /** malloc *****/
-    char *device;
     char *command = NULL;
     char *cfg_file = NULL;
-    char *mounted_cfgf_path;
     char *tmp = NULL;
     char *tmp1 = NULL;
     char *mountpt = NULL;
-    char *ramdisk_fname;
     char *mountlist_file = NULL;
     bool extract_mountlist_stub = FALSE;
@@ -2205 +2191 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(mounted_cfgf_path);
-    malloc_string(ramdisk_fname);
-    malloc_string(device);
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
     mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    device[0] = '\0';
     chdir(bkpinfo->tmpdir);
     mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
@@ -2394 +2376 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(device);
-    paranoid_free(mounted_cfgf_path);
-    paranoid_free(ramdisk_fname);
     return (retval);
 }