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

Timestamp:

Sep 17, 2009, 3:45:24 AM (15 years ago)

Author:

Bruno Cornec

Message:

Removes some malloc_string static allocation

File:

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

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

@@ -1407 +1407 @@
     char *tmp = NULL;
     char *p = NULL;
-    char *tmp1 = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
     char *command = NULL;
     char *comment = NULL;
-    char *prompt;
     int i;
     FILE *fin;
 
-    malloc_string(prompt);
-    malloc_string(tmp1);
     assert(bkpinfo != NULL);
     bkpinfo->nonbootable_backup = FALSE;
@@ -1456 +1452 @@
         if (archiving_to_media) {
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (ask_me_yes_or_no
-                    ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
-                {
+                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
                     bkpinfo->manual_cd_tray = TRUE;
                 }
             }
-            if ((bkpinfo->compression_level =
-                 which_compression_level()) == -1) {
+            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -1495 +1488 @@
             mr_free(comment);
 
-            bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
+            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
+            mr_free(tmp);
 
             mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
@@ -2022 +2016 @@
     }
     paranoid_free(sz_size);
-    paranoid_free(tmp1);
-    paranoid_free(prompt);
     return (0);
 }