Changeset 3892 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Mar 12, 2024, 3:10:24 AM (3 months ago)

Author:

Bruno Cornec

Message:

More compiler fixes

• Fix unused vars
• Fix FreeBSD #if alone
• Use MDSTAT_FILE everywhere
• Fix missing break
• Fix some strncpy. mr_strncpy used when safe
• Fix wrong g_isoform_header_str proto !
• find-cd & find-dvd => find-optical

File:

• branches/3.3/mondo/src/mondorestore/mondo-prep.c (modified) (5 diffs)

branches/3.3/mondo/src/mondorestore/mondo-prep.c

@@ -1026 +1026 @@
     }
 #else
-    fin = fopen("/proc/mdstat", "r");
+    fin = fopen(MDSTAT_FILE, "r");
     if (!fin) {
-        log_OS_error("/proc/mdstat");
+        log_OS_error(MDSTAT_FILE);
         paranoid_free(incoming);
         return (1);
@@ -1127 +1127 @@
 log_msg(1, "Creating LVMs");
 if (does_file_exist("/tmp/i-want-my-lvm")) {
-    wait_until_software_raids_are_prepped("/proc/mdstat", 100);
+    wait_until_software_raids_are_prepped(100);
     log_to_screen("Configuring LVM");
     if (!g_text_mode) {
@@ -1899 +1899 @@
 log_it("Partitioning drive %s", drivename);
 
-#if __FreeBSD__
+#ifdef __FreeBSD__
     log_it("(Not opening fdisk now; that's the Linux guy's job)");
     pout_to_fdisk = NULL;
@@ -1920 +1920 @@
     if (lino < 0) {
         // device not found in mountlist
-#if __FreeBSD__
+#ifdef __FreeBSD__
             // If this is the first partition (just as a sentinel value),
             // then see if the user has picked 'dangerously-dedicated' mode.
@@ -1986 +1986 @@
 
         log_it("Wiping %s's partition table", drivename);
-#if __FreeBSD__
+#ifdef __FreeBSD__
             // FreeBSD doesn't let you write to blk devices in <512byte chunks.
             file = open(drivename, O_WRONLY);