Changeset 3147 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (6 diffs)

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

@@ -137 +137 @@
     /** int **************************************************************/
     int i = 0;
-    int num_to_add = 0;
 
     /** newt *************************************************************/
@@ -233 +232 @@
     mr_asprintf(drive_to_add, "%s", device_str);
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
-    num_to_add = atoi(drive_to_add + i);
     mr_free(drive_to_add);
 
@@ -1943 +1941 @@
         finish(1);
     }
-    newtPushHelpLine
-        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
+    newtPushHelpLine("WARNING: No LVM modification possible here. Edit /tmp/i-want-my-lvm instead");
     i = 4;
     bAdd = newtCompactButton(i, 17, " Add ");
@@ -2423 +2420 @@
     newtComponent b2;
     newtComponent b3;
-    newtComponent b_res;
 
 
@@ -2434 +2430 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, NULL);
-    b_res = newtRunForm(myForm);
     newtFormDestroy(myForm);
     newtPopWindow();
@@ -2886 +2881 @@
             mr_getline(tmp, stdin);
             output = tmp[0];
-            free(tmp);
+            mr_free(tmp);
         }
         return (output);