Changeset 1130 in MondoRescue for branches

Timestamp:

Feb 10, 2007, 3:28:05 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix trunk transfer errors to libmondo-devices.c

File:

• branches/stable/mondo/src/common/libmondo-devices.c (modified) (13 diffs)

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

@@ -993 +993 @@
                 gotgeo = 1;
             } else {
-                mr_msg(1,
-                        "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode",
-                        strerror(errno));
+                mr_msg(1, "Harddisk geometry wrong");
+            }
+        } else {
+            mr_msg(1,
+                    "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode", strerror(errno));
             }
             close(fileid);
@@ -1146 +1148 @@
         {
             paranoid_pclose(fin);
+            mr_free(incoming);
             return(TRUE);
         }
@@ -1312 +1315 @@
     return (retval);
 }
-
-
-
-
 
 
@@ -2024 +2023 @@
 }
 
+
 /**
  * @addtogroup utilityGroup
@@ -2055 +2055 @@
 
 
-
-
 /**
  * Get a space-separated list of NFS mounts.
@@ -2082 +2080 @@
     return (result_sz);
 }
-
 /* @} - end of utilityGroup */
-
-
-
 
 
@@ -2111 +2105 @@
     mr_free(tmp);
 }
-
-
-
-
 
 
@@ -2169 +2159 @@
 
 
-
-
-
-
 /**
  * @addtogroup deviceGroup
@@ -2213 +2199 @@
     }
 }
-
-
-
 
 
@@ -2307 +2290 @@
  * @note Under Linux, all drives are examined, not just @p which_device.
  */
+char which_boot_loader(char *which_device)
+{
 #ifdef __FreeBSD__
-char which_boot_loader(char *which_device)
-{
     int count_lilos = 0;
     int count_grubs = 0;
@@ -2348 +2331 @@
         return ('U');
     }
-}
-
 #else
-
-char which_boot_loader(char *which_device)
-{
     /*@ buffer ***************************************************** */
     char *list_drives_cmd;
@@ -2416 +2394 @@
         return ('U');
     }
-}
-#endif
+#endif
+}
 
 
@@ -2543 +2521 @@
     return(output);
 }
-
 /* @} - end of deviceGroup */