Changeset 1168 in MondoRescue for branches/stable/mondo/src/mondorestore

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 :-)

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-restore.c (modified) (3 diffs)
• mondo-rstr-newt.c (modified) (9 diffs)
• mondo-rstr-newt.h (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (2 diffs)
• mr-externs.h (modified) (1 diff)

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -14 +14 @@
 #include <pthread.h>
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
+#include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
+#include "mondostructures.h"
+#include "libmondo.h"
 #include "mr-externs.h"
 #include "mondo-restore.h"
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
-#include "mr_mem.h"
-#include "mr_msg.h"
 
 extern void twenty_seconds_til_yikes(void);
@@ -1239 +1241 @@
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
                 newtRefresh();
-                strip_spaces(tmp);
+                mr_strip_spaces(tmp);
                 update_progress_form(tmp);
             }
@@ -1491 +1493 @@
             newtRefresh();
         }
-        strip_spaces(tmp);
+        mr_strip_spaces(tmp);
         update_progress_form(tmp);
         if (current_slice_number == 0) {

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);

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

@@ -19 +19 @@
 
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
+#include "mr_str.h"
+
+#include "mondostructures.h"
+#include "libmondo.h"
 #ifdef   __FreeBSD__
 #define  raid_device_record             vinum_volume
@@ -44 +46 @@
 extern long get_phys_size_of_drive(char *);
 extern bool is_this_device_mounted(char *);
-extern void strip_spaces(char *);
 extern void initialize_raidrec(struct raid_device_record *);
 extern int make_list_of_drives(struct mountlist_itself *,

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

@@ -6 +6 @@
 #include <pthread.h>
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
+#include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
+#include "mondostructures.h"
+#include "libmondo.h"
 #include "mr-externs.h"
 //#include "mondo-restore.h"
 //#include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools.h"
-#include "mr_mem.h"
-#include "mr_msg.h"
 
 extern bool g_sigpipe_caught;
@@ -110 +112 @@
     for (fgets(incoming_ptr, MAX_STR_LEN, fin);
          !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-        strip_spaces(incoming_ptr);
+        mr_strip_spaces(incoming_ptr);
 
         if (incoming[0] == '\0') {

branches/stable/mondo/src/mondorestore/mr-externs.h

@@ -71 +71 @@
 extern int read_header_block_from_stream(long long *, char *, int *);
 extern void save_filelist(struct s_node *, char *);
-extern void strip_spaces(char *);
 extern int strcmp_inc_numbers(char *, char *);
 extern char *slice_fname(long, long, char *, char *);