Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 18, 2009, 3:13:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3335@localhost: bruno | 2009-08-08 23:04:12 +0200

• Change mr_asprintf to avoid the need of pointer and be consistent with the other mr_mem functions

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (15 diffs)

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -108 +108 @@
 {
     char *tmp = NULL;
-    char *comment = NULL;
     bool is_this_a_ramdisk = FALSE;
 
     mr_asprintf(tmp, "%s", where_is_root_mounted());
-    mr_asprintf(comment, "root is currently mounted at %s\n", tmp);
-    log_msg(0, comment);
-    mr_free(comment);
+    log_msg(0, "root is currently mounted at %s\n", tmp);
 
 #ifdef __FreeBSD__
@@ -221 +218 @@
         mr_asprintf(command, "cdcontrol -f %s eject", dev);
     } else {
-        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
-                dev);
+        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`", dev);
     }
 #else
@@ -500 +496 @@
 {
     /*@ buffers ************************ */
-    char *comment = NULL;
     char *tmp = NULL;
     char *cdr_exe = NULL;
@@ -532 +527 @@
     } else {
         strcpy(cdrw_device, tmp);
-        mr_asprintf(comment, "Found CDRW device - %s", cdrw_device);
-        log_it(comment);
+        log_it("Found CDRW device - %s", cdrw_device);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
-        mr_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
@@ -876 +869 @@
     }
 
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output
-            ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         mr_free(tmp);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output
-                ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
             );
     if (tmp[0]) {
@@ -1090 +1081 @@
     malloc_string(incoming);
     assert(device_raw != NULL);
-//  assert_string_is_neither_NULL_nor_zerolength(device_raw);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1372 +1362 @@
                 log_msg(1, "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir", bkpinfo->isodir, bkpinfo->tmpdir);
                 mr_free(bkpinfo->isodir);
-                mr_asprintf(p, "%s/isodir", bkpinfo->tmpdir);
-                bkpinfo->isodir = p;
+                mr_asprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
             }
         }
@@ -1387 +1376 @@
                 cd_number_i_want);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);
+        log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
         mr_asprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
         mr_free(mds);
-        log_msg(3, tmp);
-        mr_free(tmp);
 
         while (what_number_cd_is_this() != cd_number_i_want) {
@@ -1731 +1718 @@
             mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->nfs_mount);
             mr_free(bkpinfo->isodir);
-            mr_asprintf(p, "%s", call_program_and_get_last_line_of_output(command));
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
 
@@ -1772 +1758 @@
         mr_free(bkpinfo->isodir);
         if (is_this_device_mounted(bkpinfo->nfs_mount)) {
-            mr_asprintf(p, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
 
         } else {
-            mr_asprintf(p, "%s/nfsdir", bkpinfo->tmpdir);
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -1790 +1774 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            popup_and_OK
-                ("Please mount that partition before you try to backup to or restore from it.");
+            popup_and_OK("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
@@ -2152 +2135 @@
         fatal_error("I couldn't figure out the scratchdir!");
     }
-    mr_asprintf(sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     mr_free(bkpinfo->scratchdir);
-    bkpinfo->scratchdir = sz;
+    mr_asprintf(bkpinfo->scratchdir , "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
@@ -2228 +2210 @@
 
     assert(bkpinfo != NULL);
-//  log_it("Asking what_number_cd_is_this");
+    //  log_it("Asking what_number_cd_is_this");
     if (g_ISO_restore_mode) {
         mr_asprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
-
         mr_asprintf(mountdev, "%s%s", call_program_and_get_last_line_of_output(tmp), "/archives/THIS-CD-NUMBER");
         cd_number = atoi(last_line_of_file(mountdev));
-        paranoid_free(mountdev);
-        paranoid_free(tmp);
+        mr_free(mountdev);
+        mr_free(tmp);
 
         return (cd_number);
@@ -2242 +2223 @@
     mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     if (!mountdev[0]) {
-        log_it
-            ("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
+        log_it("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
         find_cdrom_device(bkpinfo->media_device, FALSE);
     }
@@ -2253 +2233 @@
         }
     }
-    paranoid_free(mountdev);
+    mr_free(mountdev);
 
     cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));