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/common/libmondo-archive.c

    r1079 r1081  
    820820
    821821    if (g_getfattr) {
    822         asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
     822        mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
    823823        if (write_one_liner_data_file(tmp1, "TRUE")) {
    824824            log_msg(1, "%ld: Unable to write one-liner XATTR",
     
    828828    }
    829829    if (g_getfacl) {
    830         asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
     830        mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
    831831        if (write_one_liner_data_file(tmp1, "TRUE")) {
    832832            log_msg(1, "%ld: Unable to write one-liner ACL",
     
    860860
    861861    if (bkpinfo->backup_media_type == usb) {
    862         asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
    863     } else {
    864         asprintf(&tmp2,"");
     862        mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
     863    } else {
     864        mr_asprintf(&tmp2,"");
    865865    }
    866866
     
    14861486    malloc_string(result_str);
    14871487    transfer_block =
    1488         malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     1488        mr_malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
    14891489    memset((void *) transfer_block, 0,
    14901490           sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
Note: See TracChangeset for help on using the changeset viewer.