Changeset 1081 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-newt.c
- Timestamp:
- Jan 28, 2007, 11:20:07 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/mondorestore/mondo-rstr-newt.c
r900 r1081 1 1 /*************************************************************************** 2 2 * $Id$ 3 **/ 4 3 */ 5 4 6 5 /** … … 1652 1651 assert(raidrec != NULL); 1653 1652 1654 if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) { 1655 fatal_error("Cannot malloc space for raidrec"); 1656 } 1653 bkp_raidrec = mr_malloc(sizeof(struct raid_device_record)); 1657 1654 1658 1655 log_it("Started edit_raidlist_entry"); … … 1736 1733 calculate_raid_device_size(mountlist, raidlist, 1737 1734 raidrec->raid_device); 1735 <<<<<<< .courant 1738 1736 mr_free(bkp_raidrec); 1737 ======= 1738 mr_free(title_of_editraidForm_window); 1739 mr_free(sz_raid_level); 1740 mr_free(sz_data_disks); 1741 mr_free(sz_spare_disks); 1742 mr_free(sz_parity_disks); 1743 mr_free(sz_failed_disks); 1744 mr_free(bkp_raidrec); 1745 >>>>>>> .fusion-droit.r1080 1739 1746 #endif 1740 1747 } … … 1787 1794 struct mountlist_itself *unallocparts = NULL; 1788 1795 1796 <<<<<<< .courant 1789 1797 /* BERLIOS: Check return value */ 1790 1798 unallocparts = malloc(sizeof(struct mountlist_itself)); 1799 ======= 1800 unallocparts = mr_malloc(sizeof(struct mountlist_itself)); 1801 >>>>>>> .fusion-droit.r1080 1791 1802 1792 1803 log_it("Started edit_raidlist_entry"); … … 2811 2822 2812 2823 iamhere("malloc'ing"); 2813 if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) { 2814 fatal_error("Cannot malloc space for raidrec"); 2815 } 2816 if (!(bkp_disklist = malloc(sizeof(struct list_of_disks)))) { 2817 fatal_error("Cannot malloc space for disklist"); 2818 } 2819 if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself)))) { 2820 fatal_error("Cannot malloc space for raidlist"); 2821 } 2822 if (! 2823 (unallocated_raid_partitions = 2824 malloc(sizeof(struct mountlist_itself)))) { 2825 fatal_error("Cannot malloc space for unallocated_raid_partitions"); 2826 } 2824 bkp_raidrec = mr_malloc(sizeof(struct raid_device_record)); 2825 bkp_disklist = mr_malloc(sizeof(struct list_of_disks)); 2826 bkp_raidlist = mr_malloc(sizeof(struct raidlist_itself)); 2827 unallocated_raid_partitions = mr_malloc(sizeof(struct mountlist_itself)); 2827 2828 2828 2829 memcpy((void *) bkp_raidlist, (void *) raidlist, … … 2926 2927 sizeof(struct list_of_disks)); 2927 2928 } 2929 <<<<<<< .courant 2928 2930 mr_free(bkp_raidrec); 2929 2931 mr_free(bkp_disklist); 2930 2932 mr_free(bkp_raidlist); 2931 2933 mr_free(unallocated_raid_partitions); 2934 ======= 2935 mr_free(tmp); 2936 mr_free(help_text); 2937 mr_free(title_of_window); 2938 mr_free(sz_res); 2939 mr_free(header_text); 2940 mr_free(bkp_raidrec); 2941 mr_free(bkp_disklist); 2942 mr_free(bkp_raidlist); 2943 mr_free(unallocated_raid_partitions); 2944 >>>>>>> .fusion-droit.r1080 2932 2945 } 2933 2946 #endif
Note:
See TracChangeset
for help on using the changeset viewer.