Changeset 3236 in MondoRescue for branches/3.2

Timestamp:

Jan 3, 2014, 5:44:07 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix again a dyn. memory allocation issue, where a variable wasn't initialized before mr_strcat was used.

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-mountlist.c (modified) (2 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

branches/3.2/mondo/src/common/libmondo-mountlist.c

@@ -555 +555 @@
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
+    mr_asprintf(flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -561 +562 @@
 
     for (i = 0; i < drivelist->entries; i++) {
-        if (strstr
-            (drivelist->el[i].device,
-             DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
+        if (strstr(drivelist->el[i].device, DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
             log_it(" Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
         } else {

branches/3.2/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1933 +1933 @@
     flawsLabelB = newtLabel(2, 14, "         ");
     flawsLabelC = newtLabel(2, 15, "         ");
-    partitionsListbox =
-        newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+    partitionsListbox = newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
     redraw_mountlist(mountlist, keylist, partitionsListbox);
     newtOpenWindow(1, 3, 77, 18, "Editing mountlist");
@@ -1974 +1973 @@
         if (b_res == bOK) {
             if (flaws_str != NULL) {
-                finished =
-                    ask_me_yes_or_no
-                    ("Your mountlist might not work. Continue anyway?");
+                finished = ask_me_yes_or_no("Your mountlist might not work. Continue anyway?");
             } else {
-                finished =
-                    ask_me_yes_or_no
-                    ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
+                finished = ask_me_yes_or_no("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
             }
         } else if (b_res == bCancel) {
@@ -1992 +1987 @@
         } else {
             curr_choice = newtListboxGetCurrent(partitionsListbox);
-            for (i = 0;
-                 i < mountlist->entries && keylist[i] != curr_choice; i++);
+            for (i = 0; i < mountlist->entries && keylist[i] != curr_choice; i++);
             if (i == mountlist->entries && mountlist->entries > 0) {
                 log_to_screen("I don't know what that button does!");
@@ -2051 +2045 @@
         fatal_error("Don't call edit_mountlist() in text mode");
     } else {
-        log_it
-            ("I'm in GUI mode, so I shall edit mountlist using edit_mountlist()");
+        log_it("I'm in GUI mode, so I shall edit mountlist using edit_mountlist()");
         res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
     }