Changeset 3185 in MondoRescue for branches/3.0/mondo/src/mondorestore

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

Location:

branches/3.0/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (21 diffs)
• mondo-rstr-compare.c (modified) (6 diffs)
• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (12 diffs)
• mondorestore.c (modified) (8 diffs)

branches/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -335 +335 @@
             log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
-                mr_asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 free(tmp1);
             } else {
-                mr_asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 free(tmp1);
@@ -586 +586 @@
     // create device list from normal disks followed by spare ones
     if (raidlist->el[i].data_disks.el[0].device != NULL) {
-        mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+        mr_asprintf(devices, "%s", raidlist->el[i].data_disks.el[0].device);
         log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
     } else {
@@ -602 +602 @@
     // translate RAID level
     if (raidlist->el[i].raid_level == -2) {
-      mr_asprintf(&level, "multipath");
+      mr_asprintf(level, "multipath");
     } else if (raidlist->el[i].raid_level == -1) {
-      mr_asprintf(&level, "linear");
+      mr_asprintf(level, "linear");
     } else {
-      mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+      mr_asprintf(level, "raid%d", raidlist->el[i].raid_level);
     }
     // create RAID device:
@@ -614 +614 @@
     // - persistent superblock always used as this is recommended
 
-    mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
+    mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
     mr_free(level);
     log_msg(4, "cmd built: %s", program);
@@ -718 +718 @@
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        mr_asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
+        mr_asprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
         paranoid_free(tmp);
@@ -733 +733 @@
 #endif
     if (strlen(format) <= 2) {
-        mr_asprintf(&tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
+        mr_asprintf(tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         log_it(tmp);
         paranoid_free(tmp);
@@ -740 +740 @@
     }
     if (is_this_device_mounted(device)) {
-        mr_asprintf(&tmp, "%s is mounted - cannot format it      ", device);
+        mr_asprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -771 +771 @@
             char line[MAX_STR_LEN];
 
-            mr_asprintf(&tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
+            mr_asprintf(tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
             log_to_screen(tmp);
             paranoid_free(tmp);
@@ -789 +789 @@
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
 
-                mr_asprintf(&tmp, "Initializing plex: %s", line);
+                mr_asprintf(tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
                 paranoid_free(tmp);
 
-                mr_asprintf(&tmp, "vinum init %s", line);
+                mr_asprintf(tmp, "vinum init %s", line);
                 paranoid_system(tmp);
                 paranoid_free(tmp);
 
                 while (1) {
-                    mr_asprintf(&tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
+                    mr_asprintf(tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
                     FILE *pin = popen(tmp, "r");
                     paranoid_free(tmp);
@@ -820 +820 @@
         }
 #else
-        mr_asprintf(&tmp, "Initializing RAID device %s", device);
+        mr_asprintf(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -871 +871 @@
     }
     res = which_format_command_do_i_need(format, program);
-    mr_asprintf(&tmp, "%s %s", program, device);
+    mr_asprintf(tmp, "%s %s", program, device);
     if (strstr(program, "kludge")) {
         mr_strcat(tmp, " /");
@@ -878 +878 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
+    mr_asprintf(tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
     paranoid_free(tmp);
@@ -892 +892 @@
 
     if (res && strstr(program, "kludge")) {
-        mr_asprintf(&tmp, "Kludge failed; using regular mkfs.%s to format %s",
+        mr_asprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s",
                 format, device);
 #ifdef __FreeBSD__
@@ -1705 +1705 @@
         paranoid_system(tmp);
         // mark relevant partition as bootable
-        mr_asprintf(&tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
+        mr_asprintf(tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
         call_program_and_get_last_line_of_output(tmp1);
         mr_free(tmp1);
@@ -1817 +1817 @@
     /* BERLIOS: should not be called each time */
     part_table_fmt = which_partition_format(drive);
-    mr_asprintf(&output, "");
+    mr_asprintf(output, "");
     /* make it a primary/extended/logical */
     if (partno <= 4) {
@@ -2169 +2169 @@
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
-            mr_asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
+            mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
             sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
@@ -2519 +2519 @@
         return;
     }
-    mr_asprintf(&tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
+    mr_asprintf(tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2539 +2539 @@
 
     if (original_size_of_drive <= 0LL) {
-        mr_asprintf(&tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
+        mr_asprintf(tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2545 +2545 @@
     }
     factor = ((float)current_size_of_drive/(float)original_size_of_drive);
-    mr_asprintf(&tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
+    mr_asprintf(tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
             drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
     log_to_screen(tmp);
@@ -2572 +2572 @@
         totalsizL += newsizL;
 
-        mr_asprintf(&tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
+        mr_asprintf(tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2579 +2579 @@
     // Ensures over-allocation alert and prompt for interactive mode does not happen
     if (totalsizL > current_size_of_drive) {
-        mr_asprintf(&tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
+        mr_asprintf(tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
         drivemntlist->el[drivemntlist->entries-1]->size -= (totalsizL - current_size_of_drive);
     } else if (totalsizL < current_size_of_drive) {
-        mr_asprintf(&tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
+        mr_asprintf(tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
         drivemntlist->el[drivemntlist->entries-1]->size += (current_size_of_drive - totalsizL);
     }
     log_to_screen(tmp);
     mr_free(tmp);
-    mr_asprintf(&tmp, "final_size = %lld MB", current_size_of_drive / 1024);
+    mr_asprintf(tmp, "final_size = %lld MB", current_size_of_drive / 1024);
     log_to_screen(tmp);
     mr_free(tmp);

branches/3.0/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -81 +81 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            mr_asprintf(&tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
+            mr_asprintf(tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
             log_msg(2, tmp_ptr);
             paranoid_free(tmp_ptr);
@@ -88 +88 @@
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        mr_asprintf(&tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
+        mr_asprintf(tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
         paranoid_free(tmp_ptr);
@@ -105 +105 @@
 
     if (!g_text_mode) {
-        mr_asprintf(&tmp_ptr, "Comparing %s", bigfile_fname_ptr);
+        mr_asprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
         newtDrawRootText(0, 22, tmp_ptr);
         paranoid_free(tmp_ptr);
@@ -121 +121 @@
     }
     log_msg(2, command_ptr);
-    mr_asprintf(&tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    mr_asprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp_ptr);
     paranoid_free(tmp_ptr);
@@ -149 +149 @@
         }
     }
-    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
+    mr_asprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
     if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
         mr_strcat(tmp_ptr, " ... OK");
@@ -280 +280 @@
 
     if (use_star) {
-        mr_asprintf(&archiver_exe, "star");
-    } else {
-        mr_asprintf(&archiver_exe, "afio");
+        mr_asprintf(archiver_exe, "star");
+    } else {
+        mr_asprintf(archiver_exe, "afio");
     }
 

branches/3.0/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1974 +1974 @@
         /* flaws_str can be NULL */
         if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) {
-            mr_asprintf(&flaws_str_A, "");
+            mr_asprintf(flaws_str_A, "");
         } else {
-            mr_asprintf(&flaws_str_A, "%s", flaws_str + 1);
+            mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
         }
         if (strlen(flaws_str_A) >= 74) {
             for (i = 74; flaws_str_A[i] != ' '; i--);
-            mr_asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
+            mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
             flaws_str_A[i] = '\0';
         } else {
-            mr_asprintf(&flaws_str_B, "");
+            mr_asprintf(flaws_str_B, "");
         }
         if (strlen(flaws_str_B) >= 74) {
             for (i = 74; flaws_str_B[i] != ' '; i--);
-            mr_asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
+            mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
             flaws_str_B[i] = '\0';
         } else {
-            mr_asprintf(&flaws_str_C, "");
+            mr_asprintf(flaws_str_C, "");
         }
 

branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -330 +330 @@
                 if (HDD) {
                     /*  We need an additional param */
-                    mr_asprintf(&(bkpinfo->subdir), "%s", bkpinfo->isodir);
+                    mr_asprintf(bkpinfo->subdir, "%s", bkpinfo->isodir);
                     strcpy(bkpinfo->isodir, "/tmp/isodir");
                     log_it("Now bkpinfo->isodir = %s and subdir = ", bkpinfo->isodir, bkpinfo->subdir);
@@ -383 +383 @@
     log_to_screen("WARNING - isodir is already mounted");
 } else {
-    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
+    mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
     if (strlen(g_isodir_format) > 1) {
         mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
@@ -478 +478 @@
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
-    mr_asprintf(&additional_parameters, "");
+    mr_asprintf(additional_parameters, "");
     if (strcmp(format, "proc") && strcmp(format, "sys")) {
         if (writeable) {
@@ -586 +586 @@
                "", mountlist->entries);
 
-    mr_asprintf(&these_failed, "");
+    mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
@@ -766 +766 @@
     bkpinfo->please_dont_eject = TRUE;
     if (read_cfg_var(cfg_file, "netfs-proto", value) == 0) {
-        mr_asprintf(&(bkpinfo->netfs_proto),"%s", value);
+        mr_asprintf(bkpinfo->netfs_proto,"%s", value);
     } else {
         /* For compatibility, force protocol in old nfs case to be transparent */
-        mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
+        mr_asprintf(bkpinfo->netfs_proto, "nfs");
     }
     if (read_cfg_var(cfg_file, "netfs-server-user", value) == 0) {
-        mr_asprintf(&(bkpinfo->netfs_user),"%s", value);
+        mr_asprintf(bkpinfo->netfs_user,"%s", value);
     }
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
@@ -851 +851 @@
 read_cfg_var(cfg_file, "acl", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfacl,"setfacl");
+    mr_asprintf(g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
     if (! find_home_of_exe("setfacl")) {
@@ -859 +859 @@
 read_cfg_var(cfg_file, "xattr", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfattr,"setfattr");
+    mr_asprintf(g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
     if (! find_home_of_exe("setfattr")) {
@@ -1370 +1370 @@
      * the current /dev location 
      */
-    mr_asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    mr_asprintf(cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
     run_program_and_log_output(cmd, 3);
     paranoid_free(cmd);
@@ -1385 +1385 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    mr_asprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
     log_msg(2, tmp);
     paranoid_free(tmp);
@@ -1402 +1402 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        mr_asprintf(&tmp, "boot0cfg -B %s", device);
+        mr_asprintf(tmp, "boot0cfg -B %s", device);
         res = run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     } else {
-        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             paranoid_free(tmp);
-            mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            mr_asprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -2056 +2056 @@
     paranoid_system("sync");
 
-    mr_asprintf(&tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
+    mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(1,
@@ -2075 +2075 @@
             continue;
         }
-        mr_asprintf(&tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
 
         update_progress_form(tmp);

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -354 +354 @@
 
     /* Clean up blkid cache file if they exist */
-    mr_asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    mr_asprintf(tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
-    mr_asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    mr_asprintf(tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
@@ -369 +369 @@
 
     /* Clean up multiconf cache file if they exist */
-    mr_asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
+    mr_asprintf(tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
 
     /* Edit multipath.conf if needed to adapt wwid */
-    mr_asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
+    mr_asprintf(tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
     if (does_file_exist(tmp1)) {
         log_msg(2, "We may need to clean /etc/multipath.conf");
@@ -384 +384 @@
 
     if (bkpinfo->restore_mode != nuke) {
-        mr_asprintf(&editor, "%s", find_my_editor());
-        mr_asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
+        mr_asprintf(editor, "%s", find_my_editor());
+        mr_asprintf(tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
         popup_and_OK("You will now edit multipath.conf");
         if (!g_text_mode) {
@@ -1670 +1670 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
 //  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
-    mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
+    mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
     paranoid_free(command);
@@ -1757 +1757 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
+            mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1763 +1763 @@
         } else {
             if (filelist_subset_fname[0] != '\0') {
-                mr_asprintf(&command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
             } else {
-                mr_asprintf(&command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
             }
         }
@@ -1818 +1818 @@
         // Be verbose for star
         if (retval || use_star) {
-            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             paranoid_system(command);
             paranoid_free(command);
@@ -2310 +2310 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ",
                     mds, g_current_media_number, current_tarball_number);
             if (res) {