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

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

@@ -828 +828 @@
     bkpinfo->disaster_recovery = (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     if (bkpinfo->disaster_recovery) {
-        mr_asprintf(p, "%s", "/");
+        mr_asprintf(bkpinfo->isodir, "%s", "/");
     } else {
-        mr_asprintf(p, "%s", MONDO_CACHE);
-    }
-    bkpinfo->isodir = p;
-    mr_asprintf(p, "%s", STD_PREFIX);
-    bkpinfo->prefix = p;
-    bkpinfo->scratchdir = NULL;
-    bkpinfo->tmpdir = NULL;
+        mr_asprintf(bkpinfo->isodir, "%s", MONDO_CACHE);
+    }
+    mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    bkpinfo->scratchdir = NULL;     // Really setup after
+    bkpinfo->tmpdir = NULL;         // Really setup after
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
@@ -889 +887 @@
     mr_free(command);
 
-    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
-            partition);
+    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", partition);
     mr_asprintf(out_sz, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -941 +938 @@
     }
     if (atol(tmp) < 66000) {
-        log_to_screen
-            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+        log_to_screen("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     }
     mr_free(tmp);
@@ -1080 +1076 @@
     /*@ buffer ****************************************************** */
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1087 +1082 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(tmp, "(read_cfg_var) Cannot find %s config file", config_file);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
+        log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
         value[0] = '\0';
         return (1);
@@ -1252 +1244 @@
                     strcpy(g_boot_mountpt, tmp);
                     mr_free(tmp);
-                    mr_asprintf(tmp, "%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
-                    log_it(tmp);
-                    mr_free(tmp);
+                    log_it("%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
 
                     mr_asprintf(tmp, "mount %s", g_boot_mountpt);
@@ -1311 +1301 @@
     char *command = NULL;
     char *tempfile = NULL;
-    char *tmp = NULL;
 
 
@@ -1319 +1308 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(tmp, "(write_cfg_file) Cannot find %s config file", config_file);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("(write_cfg_file) Cannot find %s config file", config_file);
         return (1);
     }