Changeset 2257 in MondoRescue

Timestamp:

Jul 5, 2009, 6:56:03 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Reorder code to allow compilation by older gcc versions

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (1 diff)

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

@@ -1277 +1277 @@
     char *command = NULL;
     int retval;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-
-    make_hole_for_dir(mountpoint);
-
 #ifdef __FreeBSD__
     char *dev = NULL;
 #else
     char *options = NULL;
-    mr_asprintf(&options, "ro");
-#endif
+#endif
+
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    make_hole_for_dir(mountpoint);
 
     if (isdigit(device[0])) {
         find_cdrom_device(device, FALSE);
     }
+#ifndef __FreeBSD__
+    mr_asprintf(&options, "ro");
+#endif
+
     if (g_ISO_restore_mode) {