Changeset 1168 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Feb 15, 2007, 12:27:39 AM (17 years ago)

Author:

Bruno Cornec

Message:

strip_spaces => mr_strip_spaces in mr_str.c and corrected at the same time :-)

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (9 diffs)

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

@@ -5 +5 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
 
 extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
@@ -215 +216 @@
         strcpy(size_str, size_here);
 //      log_it ("Originals = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
-        strip_spaces(device_str);
-        strip_spaces(mountpoint_str);
-        strip_spaces(format_str);
-        strip_spaces(size_str);
+        mr_strip_spaces(device_str);
+        mr_strip_spaces(mountpoint_str);
+        mr_strip_spaces(format_str);
+        mr_strip_spaces(size_str);
 //      log_it ("Modified = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
         if (b_res == bOK) {
@@ -278 +279 @@
         ("Add variable", "Enter the name of the variable to add", sz_out,
          MAX_STR_LEN)) {
-        strip_spaces(sz_out);
+        mr_strip_spaces(sz_out);
         items = raidrec->additional_vars.entries;
         for (i = 0;
@@ -498 +499 @@
             return;
         }
-        strip_spaces(tmp);
+        mr_strip_spaces(tmp);
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
             strcpy(sz, tmp);
@@ -552 +553 @@
             return;
         }
-        strip_spaces(tmp);
+        mr_strip_spaces(tmp);
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
             strcpy(sz, tmp);
@@ -1231 +1232 @@
         b_res = newtRunForm(myForm);
         strcpy(device_str, device_here);
-        strip_spaces(device_str);
+        mr_strip_spaces(device_str);
         strcpy(mountpoint_str, mountpoint_here);
-        strip_spaces(mountpoint_str);
+        mr_strip_spaces(mountpoint_str);
         strcpy(format_str, format_here);
-        strip_spaces(format_str);
+        mr_strip_spaces(format_str);
         if (b_res == bOK && strstr(device_str, RAID_DEVICE_STUB)
             && strstr(device_used_to_be, RAID_DEVICE_STUB)
@@ -1251 +1252 @@
             && strcmp(mountlist->el[currline].mountpoint, "image")) {
             strcpy(size_str, size_here);
-            strip_spaces(size_str);
+            mr_strip_spaces(size_str);
         } else {
             sprintf(size_str, "%ld",
@@ -1898 +1899 @@
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
-        strip_spaces(sz_out);
+        mr_strip_spaces(sz_out);
         strcpy(raidrec->additional_vars.el[lino].value, sz_out);
     }
@@ -2306 +2307 @@
                  "At what path on this device can the ISO files be found?",
                  isodir_path, MAX_STR_LEN / 4)) {
-                strip_spaces(isodir_device);
-                strip_spaces(isodir_format);
-                strip_spaces(isodir_path);
+                mr_strip_spaces(isodir_device);
+                mr_strip_spaces(isodir_format);
+                mr_strip_spaces(isodir_path);
                 log_it("%d - BBB - isodir_path = %s", isodir_path);
                 return (TRUE);