Ignore:
Timestamp:
Jan 28, 2007, 11:20:07 PM (12 years ago)
Author:
bruno
Message:

merge -r1078:1080 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/mondorestore/mondo-rstr-newt.c

    r900 r1081  
    11/***************************************************************************
    22 * $Id$
    3 **/
    4 
     3*/
    54
    65/**
     
    16521651    assert(raidrec != NULL);
    16531652
    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));
    16571654
    16581655    log_it("Started edit_raidlist_entry");
     
    17361733        calculate_raid_device_size(mountlist, raidlist,
    17371734                                   raidrec->raid_device);
     1735<<<<<<< .courant
    17381736    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
    17391746#endif
    17401747}
     
    17871794    struct mountlist_itself *unallocparts = NULL;
    17881795
     1796<<<<<<< .courant
    17891797    /* BERLIOS: Check return value */
    17901798    unallocparts = malloc(sizeof(struct mountlist_itself));
     1799=======
     1800    unallocparts = mr_malloc(sizeof(struct mountlist_itself));
     1801>>>>>>> .fusion-droit.r1080
    17911802
    17921803    log_it("Started edit_raidlist_entry");
     
    28112822
    28122823    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));
    28272828
    28282829    memcpy((void *) bkp_raidlist, (void *) raidlist,
     
    29262927               sizeof(struct list_of_disks));
    29272928    }
     2929<<<<<<< .courant
    29282930    mr_free(bkp_raidrec);
    29292931    mr_free(bkp_disklist);
    29302932    mr_free(bkp_raidlist);
    29312933    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
    29322945}
    29332946#endif
Note: See TracChangeset for help on using the changeset viewer.