Changeset 2136 in MondoRescue for branches/2.2.8/mondo/src/common

Timestamp:

Feb 2, 2009, 1:09:01 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a bug with Newt where a newtResume was missing after multipath.conf edit

File:

• branches/2.2.8/mondo/src/common/newt-specific.c (modified) (6 diffs)

branches/2.2.8/mondo/src/common/newt-specific.c

@@ -121 +121 @@
 
         /*@ buffers ********************************************************** */
-        char *tmp;
         int i;
 
-         tmp = malloc(MAX_NEWT_COMMENT_LEN);
          assert_string_is_neither_NULL_nor_zerolength(prompt);
 
         if (g_text_mode) {
+
+            char *tmp;
+            tmp = malloc(MAX_NEWT_COMMENT_LEN);
+
             while (1) {
                 system("sync");
@@ -154 +156 @@
             }
         } else {
-            paranoid_free(tmp);
             return (popup_with_buttons(prompt, "Yes", "No"));
         }
@@ -798 +799 @@
 
         /*@ buffers *********************************************************** */
-        char *prompt, *tmp;
+        char *prompt;
 
         /*@ newt ************************************************************** */
@@ -807 +808 @@
         newtComponent text;
 
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(p);
         assert(button1 != NULL);
         assert(button2 != NULL);
+        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             if (strlen(button2) == 0) {
@@ -818 +818 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (tmp[0] = '\0';
-                 strcmp(tmp, button1) && (strlen(button2) == 0
-                                          || strcmp(tmp, button2));) {
+            for (prompt[0] = '\0';
+                 strcmp(prompt, button1) && (strlen(button2) == 0
+                                          || strcmp(prompt, button2));) {
                 printf("--> ");
-                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
-            }
-            if (!strcmp(tmp, button1)) {
-                paranoid_free(tmp);
+                (void) fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+            }
+            if (!strcmp(prompt, button1)) {
                 paranoid_free(prompt);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
                 paranoid_free(prompt);
                 return (FALSE);
@@ -861 +859 @@
         newtPopWindow();
         if (b_res == b_1) {
-            paranoid_free(tmp);
             paranoid_free(prompt);
             return (TRUE);
         } else {
-            paranoid_free(tmp);
             paranoid_free(prompt);
             return (FALSE);