Changeset 1176 in MondoRescue for trunk/mondo/src/common/libmondo-devices.c

Timestamp:

Feb 16, 2007, 2:16:14 PM (17 years ago)

Author:

Bruno Cornec

Message:

Some merges from stable (synchro for mem. mngt)

File:

• trunk/mondo/src/common/libmondo-devices.c (modified) (8 diffs)

trunk/mondo/src/common/libmondo-devices.c

@@ -19 +19 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_str.h"
 
 #include <sys/ioctl.h>
@@ -41 +42 @@
 
 extern bool g_ISO_restore_mode;
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_selfmounted_isodir;
@@ -1093 +1093 @@
 
     FILE *pin = NULL;
-    bool retval;
+    bool retval = FALSE;
     size_t n = 0;
     assert_string_is_neither_NULL_nor_zerolength(format);
@@ -1112 +1112 @@
     if (!pin) {
         log_OS_error("Unable to read good formats");
-        retval = FALSE;
     } else {
         mr_getline(&good_formats, &n , pin);
@@ -1118 +1117 @@
             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);
@@ -1126 +1125 @@
         if (strstr(good_formats, format_sz)) {
             retval = TRUE;
-        } else {
-            retval = FALSE;
         }
         mr_free(good_formats);
@@ -1693 +1690 @@
             // 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';
@@ -2270 +2265 @@
     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")) {