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-restore.c

    r1079 r1081  
    11/***************************************************************************
    2 $Id$
    3 restores mondoarchive data
     2* restores mondoarchive data
     3* $Id$
    44***************************************************************************/
    55
     
    910910    assert(bkpinfo != NULL);
    911911
    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));
    918914
    919915    mr_allocstr(bkpinfo->restore_path, "/");
     
    964960        eject_device(bkpinfo->media_device);
    965961    }
    966     free(mountlist);
    967     free(raidlist);
     962    mr_free(mountlist);
     963    mr_free(raidlist);
    968964    return (retval);
    969965}
     
    10291025    assert(bkpinfo != NULL);
    10301026
    1031     if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
    1032         fatal_error("Cannot malloc bigblk");
    1033     }
     1027    bigblk = mr_malloc(TAPE_BLOCK_SIZE);
    10341028
    10351029    tmp = slice_fname(bigfileno, 0, ARCHIVES_PATH, "");
     
    17511745    mr_free(acl_fname);
    17521746    mr_free(temp_log);
    1753 
    17541747    log_msg(5, "Leaving");
    17551748    return (retval);
     
    28762869    mr_free(tmp);
    28772870
    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));
    28892874
    28902875    malloc_libmondo_global_strings();
Note: See TracChangeset for help on using the changeset viewer.