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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c
r2404 r2405 698 698 t_bkptype media_specified_by_user; 699 699 700 malloc_string(tmp);701 700 // assert_string_is_neither_NULL_nor_zerolength(cfg_file); 702 701 assert(bkpinfo != NULL); … … 1099 1098 g_backup_media_type = bkpinfo->backup_media_type; 1100 1099 paranoid_free(value); 1101 paranoid_free(tmp);1102 1100 return (0); 1103 1101 … … 1499 1497 char *command = NULL; 1500 1498 char *boot_device = NULL; 1501 char *rootdev;1502 char *rootdrive;1503 char *conffile;1504 1499 char *tmp = NULL; 1505 1500 char *editor = NULL; … … 1509 1504 bool done; 1510 1505 1511 malloc_string(rootdev);1512 malloc_string(rootdrive);1513 malloc_string(conffile);1514 1506 assert_string_is_neither_NULL_nor_zerolength(bd); 1515 1507 mr_asprintf(boot_device, "%s", bd); … … 1617 1609 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 1618 1610 } 1619 paranoid_free(rootdev);1620 paranoid_free(rootdrive);1621 paranoid_free(conffile);1622 1611 1623 1612 return (res); … … 2190 2179 2191 2180 /** malloc *****/ 2192 char *device;2193 2181 char *command = NULL; 2194 2182 char *cfg_file = NULL; 2195 char *mounted_cfgf_path;2196 2183 char *tmp = NULL; 2197 2184 char *tmp1 = NULL; 2198 2185 char *mountpt = NULL; 2199 char *ramdisk_fname;2200 2186 char *mountlist_file = NULL; 2201 2187 bool extract_mountlist_stub = FALSE; … … 2205 2191 2206 2192 assert(bkpinfo != NULL); 2207 malloc_string(mounted_cfgf_path);2208 malloc_string(ramdisk_fname);2209 malloc_string(device);2210 2193 log_msg(2, "gcffa --- starting"); 2211 2194 log_to_screen("I'm thinking..."); 2212 2195 mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir); 2213 device[0] = '\0';2214 2196 chdir(bkpinfo->tmpdir); 2215 2197 mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB); … … 2394 2376 } 2395 2377 g_backup_media_type = bkpinfo->backup_media_type; 2396 paranoid_free(device);2397 paranoid_free(mounted_cfgf_path);2398 paranoid_free(ramdisk_fname);2399 2378 return (retval); 2400 2379 }
Note:
See TracChangeset
for help on using the changeset viewer.