Changeset 1081 in MondoRescue for trunk/mondo/src/common/libmondo-archive.c

Timestamp:

Jan 28, 2007, 11:20:07 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1078:1080 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-archive.c (modified) (4 diffs)

trunk/mondo/src/common/libmondo-archive.c

@@ -820 +820 @@
 
     if (g_getfattr) {
-        asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner XATTR",
@@ -828 +828 @@
     }
     if (g_getfacl) {
-        asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner ACL",
@@ -860 +860 @@
 
     if (bkpinfo->backup_media_type == usb) {
-        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
-    } else {
-        asprintf(&tmp2,"");
+        mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+    } else {
+        mr_asprintf(&tmp2,"");
     }
 
@@ -1486 +1486 @@
     malloc_string(result_str);
     transfer_block =
-        malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+        mr_malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     memset((void *) transfer_block, 0,
            sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);