Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-verify.c

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

File:

• branches/3.0/mondo/src/common/libmondo-verify.c (modified) (6 diffs)

branches/3.0/mondo/src/common/libmondo-verify.c

@@ -333 +333 @@
                             bkpinfo->restore_path,
                             biggiestruct.filename);
-                mr_asprintf(&mds, "echo \"%s/%s not found\" >> %s/biggies.changed",
+                mr_asprintf(mds, "echo \"%s/%s not found\" >> %s/biggies.changed",
                             bkpinfo->restore_path,
                             biggiestruct.filename,
@@ -981 +981 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(&fname, "%s1", bkpinfo->media_device);
+    mr_asprintf(fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        mr_asprintf(&tmp, "umount %s", fname);
+        mr_asprintf(tmp, "umount %s", fname);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -991 +991 @@
 
     log_msg(1, "Mounting USB device.");
-    mr_asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "mkdir -p %s", mountpoint);
+    mr_asprintf(mountpoint, "%s/usb", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "mkdir -p %s", mountpoint);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     /* Mindi always create one single parition on the USB dev */
-    mr_asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
+    mr_asprintf(tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
     ret = run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1006 +1006 @@
     sync();
     log_msg(2, "OK, I've mounted the USB Disk/Key\n");
-    mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -1023 +1023 @@
     verify_all_slices_on_CD(mountpoint);
 
-    mr_asprintf(&tmp1, "umount -d %s", mountpoint);
+    mr_asprintf(tmp1, "umount -d %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1032 +1032 @@
 #endif
     {
-        mr_asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        mr_asprintf(tmp, "%s failed; unable to unmount USB device\n", tmp1);
         log_to_screen(tmp);
         paranoid_free(tmp);