Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (10 diffs)

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

@@ -272 +272 @@
     if (!bkpinfo->isodir[0]) {
         mr_free(bkpinfo->isodir);
-        mr_asprintf(p, "/tmp/isodir");
-        bkpinfo->isodir = p;
+        mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
     }
     /* End patch */
@@ -498 +497 @@
                 "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(tmp, "%s is already mounted", mountlist->el[lino].device);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("%s is already mounted", mountlist->el[lino].device);
         } else if (strcmp(mountlist->el[lino].mountpoint, "none")
            && strcmp(mountlist->el[lino].mountpoint, "lvm")
@@ -595 +592 @@
         if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
             mr_free(bkpinfo->isodir);
-            mr_asprintf(p, "/tmp/isodir");
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
@@ -772 +768 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(tmp1, "%s", value);
-    } else {
-        mr_asprintf(tmp1, "%s", STD_PREFIX);
-    }
-    bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", value);
+    } else {
+        mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    }
 } else if (!strcmp(value, "nfs")) {
     bkpinfo->backup_media_type = nfs;
@@ -782 +777 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(tmp1, "%s", value);
-    } else {
-        mr_asprintf(tmp1, "%s", STD_PREFIX);
-    }
-    bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", value);
+    } else {
+        mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    }
 
     if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
@@ -796 +790 @@
         }
         mr_free(bkpinfo->prefix);
-        mr_asprintf(tmp1, "%s", envtmp1);
-        bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", envtmp1);
     }
 
@@ -970 +963 @@
     read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
     mr_free(bkpinfo->isodir);
-    mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path);
-    bkpinfo->isodir = tmp1;
+    mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
     if (!bkpinfo->isodir[0]) {
         mr_free(bkpinfo->isodir);
@@ -2012 +2004 @@
         }
         mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
-
         update_progress_form(tmp);
 
@@ -2194 +2185 @@
             }
             mr_asprintf(tmp, "%s", bkpinfo->media_device);
-            if (extract_cfg_file_and_mountlist_from_tape_dev
-                (bkpinfo->media_device)) {
+            if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                 strcpy(bkpinfo->media_device, "/dev/st0");
-                if (extract_cfg_file_and_mountlist_from_tape_dev
-                    (bkpinfo->media_device)) {
+                if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                     strcpy(bkpinfo->media_device, "/dev/osst0");
-                    if (extract_cfg_file_and_mountlist_from_tape_dev
-                        (bkpinfo->media_device)) {
+                    if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                         strcpy(bkpinfo->media_device, "/dev/ht0");
-                        if (extract_cfg_file_and_mountlist_from_tape_dev
-                            (bkpinfo->media_device)) {
-                            log_msg(3,
-                                    "I tried lots of devices but none worked.");
+                        if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
+                            log_msg(3, "I tried lots of devices but none worked.");
                             strcpy(bkpinfo->media_device, tmp);
                         }
@@ -2343 +2329 @@
 /* @} - end restoreUtilityGroup */
 
-
-/***************************************************************************
- * F@                                                                      *
- * () -- Hugo Rabson                                  *
- *                                                                         *
- * Purpose:                                                                *
- *                                                                         *
- * Called by:                                                              *
- * Params:    -                      -                                     *
- * Returns:   0=success; nonzero=failure                                   *
- ***************************************************************************/
-
-
-
 void wait_until_software_raids_are_prepped(char *mdstat_file,
                                            int wait_for_percentage)