Changeset 1168 in MondoRescue for branches/stable/mondo/src/common/libmondo-devices.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/common/libmondo-devices.c (modified) (9 diffs)

branches/stable/mondo/src/common/libmondo-devices.c

@@ -19 +19 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
 
 #include <sys/ioctl.h>
@@ -1108 +1109 @@
 
     FILE *pin = NULL;
-    bool retval;
+    bool retval = FALSE;
     size_t n = 0;
     assert_string_is_neither_NULL_nor_zerolength(format);
@@ -1127 +1128 @@
     if (!pin) {
         log_OS_error("Unable to read good formats");
-        retval = FALSE;
     } else {
         mr_getline(&good_formats, &n , pin);
@@ -1133 +1133 @@
             log_OS_error("Cannot pclose good formats");
         }
-        strip_spaces(good_formats);
+        mr_strip_spaces(good_formats);
         // " ntfs 7 " -- um, cheating much? :)
         mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
@@ -1141 +1141 @@
         if (strstr(good_formats, format_sz)) {
             retval = TRUE;
-        } else {
-            retval = FALSE;
         }
         mr_free(good_formats);
@@ -1704 +1702 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            /* BERLIOS: Useless
-            strip_spaces(bkpinfo->nfs_mount);
-            */
+            mr_strip_spaces(bkpinfo->nfs_mount);
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
@@ -1768 +1764 @@
         mr_free(tmp);
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces(bkpinfo->nfs_remote_dir);
+        mr_strip_spaces(bkpinfo->nfs_remote_dir);
         mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
@@ -1786 +1782 @@
             mr_free(tmp);
             // check whether writable - we better remove surrounding space s for this
-            strip_spaces(bkpinfo->nfs_remote_dir);
+            mr_strip_spaces(bkpinfo->nfs_remote_dir);
 
             mr_free(command);
@@ -2293 +2289 @@
     for (mr_getline(&current_drive, &n, pdrives); !feof(pdrives);
          mr_getline(&current_drive, &n, pdrives)) {
-        strip_spaces(current_drive);
+        mr_strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {