Changeset 1081 in MondoRescue for trunk/mondo/src/mondorestore/mondo-restore.c
- Timestamp:
- Jan 28, 2007, 11:20:07 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/mondorestore/mondo-restore.c
r1079 r1081 1 1 /*************************************************************************** 2 $Id$ 3 restores mondoarchive data 2 * restores mondoarchive data 3 * $Id$ 4 4 ***************************************************************************/ 5 5 … … 910 910 assert(bkpinfo != NULL); 911 911 912 mountlist = malloc(sizeof(struct mountlist_itself)); 913 raidlist = malloc(sizeof(struct raidlist_itself)); 914 915 if (!mountlist || !raidlist) { 916 fatal_error("Cannot malloc() mountlist and/or raidlist"); 917 } 912 mountlist = mr_malloc(sizeof(struct mountlist_itself)); 913 raidlist = mr_malloc(sizeof(struct raidlist_itself)); 918 914 919 915 mr_allocstr(bkpinfo->restore_path, "/"); … … 964 960 eject_device(bkpinfo->media_device); 965 961 } 966 free(mountlist);967 free(raidlist);962 mr_free(mountlist); 963 mr_free(raidlist); 968 964 return (retval); 969 965 } … … 1029 1025 assert(bkpinfo != NULL); 1030 1026 1031 if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) { 1032 fatal_error("Cannot malloc bigblk"); 1033 } 1027 bigblk = mr_malloc(TAPE_BLOCK_SIZE); 1034 1028 1035 1029 tmp = slice_fname(bigfileno, 0, ARCHIVES_PATH, ""); … … 1751 1745 mr_free(acl_fname); 1752 1746 mr_free(temp_log); 1753 1754 1747 log_msg(5, "Leaving"); 1755 1748 return (retval); … … 2876 2869 mr_free(tmp); 2877 2870 2878 if (! 2879 (bkpinfo = g_bkpinfo_DONTUSETHIS = 2880 malloc(sizeof(struct s_bkpinfo)))) { 2881 fatal_error("Cannot malloc bkpinfo"); 2882 } 2883 if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) { 2884 fatal_error("Cannot malloc mountlist"); 2885 } 2886 if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) { 2887 fatal_error("Cannot malloc raidlist"); 2888 } 2871 bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo)); 2872 mountlist = mr_malloc(sizeof(struct mountlist_itself)); 2873 raidlist = mr_malloc(sizeof(struct raidlist_itself)); 2889 2874 2890 2875 malloc_libmondo_global_strings();
Note:
See TracChangeset
for help on using the changeset viewer.