Changeset 3185 in MondoRescue for branches/3.0/mondo/src/mondoarchive/mondoarchive.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/mondoarchive/mondoarchive.c (modified) (4 diffs)

branches/3.0/mondo/src/mondoarchive/mondoarchive.c

@@ -206 +206 @@
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    mr_asprintf(&tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
+    mr_asprintf(tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
     setenv("PATH", tmp1, 1);
     paranoid_free(tmp1);
 
     /* Add the ARCH environment variable for ia64 purposes */
-    mr_asprintf(&tmp1,"%s",get_architecture());
+    mr_asprintf(tmp1,"%s",get_architecture());
     setenv("ARCH", tmp1, 1);
     paranoid_free(tmp1);
@@ -382 +382 @@
         retval += res;
         if (res) {
-            mr_asprintf(&say_at_end, "Data archived. Please check the logs, just as a precaution. ");
-        } else {
-            mr_asprintf(&say_at_end, "Data archived OK. ");
+            mr_asprintf(say_at_end, "Data archived. Please check the logs, just as a precaution. ");
+        } else {
+            mr_asprintf(say_at_end, "Data archived OK. ");
         }
     }
@@ -392 +392 @@
         res = verify_data();
         if (res < 0) {
-            mr_asprintf(&tmp, "%d difference%c found.", -res,
+            mr_asprintf(tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
-            mr_asprintf(&say_at_end, "%s", tmp);
+            mr_asprintf(say_at_end, "%s", tmp);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -432 +432 @@
         paranoid_free(say_at_end);
     }
-    mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
-        mr_asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);
         mr_free(tmp);