Changeset 3879 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-mountlist.c

Timestamp:

Mar 9, 2024, 3:10:04 AM (3 months ago)

Author:

Bruno Cornec

Message:

Fix all remaining compiler errors

File:

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

branches/3.3/mondo/src/mondorestore/mondo-rstr-mountlist.c

@@ -12 +12 @@
 #include "mr_mem.h"
 #include "mondostructures.h"
-#include "libmondo-mountlist.h"
-
 #include "libmondo-raid-EXT.h"
 #include "libmondo-devices-EXT.h"
@@ -535 +533 @@
 
 /**
+ * Make a list of the drives mentioned in the mountlist.
+ * @param mountlist The mountlist to examine.
+ * @param drivelist Where to put the list of drives found.
+ * @return The number of physical (non-RAID non-LVM) drives found, or \<= 0 for error.
+ */
+int
+make_list_of_drives_in_mountlist(struct mountlist_itself *mountlist,
+                                 struct list_of_disks *drivelist)
+{
+
+    /*@ int ************************************************************* */
+    int lino;
+    int noof_drives;
+    int j;
+
+    /*@ buffers ********************************************************* */
+    char *drive = NULL;
+    char *truncdrive = NULL;
+
+    long long size;
+
+    assert(mountlist != NULL);
+    assert(drivelist != NULL);
+    log_it("Making list of drives");
+    for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
+
+        mr_asprintf(drive, "%s", mountlist->el[lino].device);
+        if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
+            log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
+            mr_free(drive);
+            continue;
+        }
+
+        size = mountlist->el[lino].size;
+        if (size == 0) {
+            log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
+            mr_free(drive);
+            continue;
+        }
+
+        log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
+
+        /* memory allocation */
+        truncdrive = truncate_to_drive_name(drive);
+        mr_free(drive);
+
+        log_msg(8, "drive truncated to %s", truncdrive);
+
+        for (j = 0;
+             j < noof_drives
+             && strcmp(drivelist->el[j].device, truncdrive) != 0; j++) {
+            continue;
+        }
+        if (j == noof_drives) {
+            strncpy(drivelist->el[noof_drives].device, truncdrive, 63);
+            drivelist->el[noof_drives].device[63] = '\0';
+            log_msg(8,"Adding drive %s to list", drivelist->el[noof_drives].device);
+            noof_drives++;
+        }
+        paranoid_free(truncdrive);
+        if (noof_drives >= MAXIMUM_DISKS_PER_RAID_DEV) {
+            log_msg(0, "Unable to handle mountlist with more than %d lines", MAXIMUM_DISKS_PER_RAID_DEV);
+            log_to_screen("Unable to handle a so big mountlist");
+            finish(1);
+        }
+    }
+    drivelist->entries = noof_drives;
+    log_msg(8, "Made list of %d drives",noof_drives);
+
+    return (noof_drives);
+}
+
+
+/**
  * Evaluate a whole mountlist for flaws. Calls evaluate_drive_within_mountlist()
  * for each drive, and then spreads the flaws across three lines.
@@ -642 +714 @@
         return (i);
     }
-}
-
-
-/**
- * Make a list of the drives mentioned in the mountlist.
- * @param mountlist The mountlist to examine.
- * @param drivelist Where to put the list of drives found.
- * @return The number of physical (non-RAID non-LVM) drives found, or \<= 0 for error.
- */
-int
-make_list_of_drives_in_mountlist(struct mountlist_itself *mountlist,
-                                 struct list_of_disks *drivelist)
-{
-
-    /*@ int ************************************************************* */
-    int lino;
-    int noof_drives;
-    int j;
-
-    /*@ buffers ********************************************************* */
-    char *drive = NULL;
-    char *truncdrive = NULL;
-
-    long long size;
-
-    assert(mountlist != NULL);
-    assert(drivelist != NULL);
-    log_it("Making list of drives");
-    for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
-
-        mr_asprintf(drive, "%s", mountlist->el[lino].device);
-        if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
-            mr_free(drive);
-            continue;
-        }
-
-        size = mountlist->el[lino].size;
-        if (size == 0) {
-            log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
-            mr_free(drive);
-            continue;
-        }
-
-        log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
-
-        /* memory allocation */
-        truncdrive = truncate_to_drive_name(drive);
-        mr_free(drive);
-
-        log_msg(8, "drive truncated to %s", truncdrive);
-
-        for (j = 0;
-             j < noof_drives
-             && strcmp(drivelist->el[j].device, truncdrive) != 0; j++) {
-            continue;
-        }
-        if (j == noof_drives) {
-            strncpy(drivelist->el[noof_drives].device, truncdrive, 63);
-            drivelist->el[noof_drives].device[63] = '\0';
-            log_msg(8,"Adding drive %s to list", drivelist->el[noof_drives].device);
-            noof_drives++;
-        }
-        paranoid_free(truncdrive);
-        if (noof_drives >= MAXIMUM_DISKS_PER_RAID_DEV) {
-            log_msg(0, "Unable to handle mountlist with more than %d lines", MAXIMUM_DISKS_PER_RAID_DEV);
-            log_to_screen("Unable to handle a so big mountlist");
-            finish(1);
-        }
-    }
-    drivelist->entries = noof_drives;
-    log_msg(8, "Made list of %d drives",noof_drives);
-
-    return (noof_drives);
 }
 
@@ -938 +936 @@
 
 /**
+ * Swap two entries in the mountlist in-place.
+ * @param mountlist The mountlist to swap the entries in.
+ * @param a The index number of the first entry.
+ * @param b The index number of the second entry.
+ */
+void
+swap_mountlist_entries(struct mountlist_itself *mountlist, int a, int b)
+{
+    /*@ mallocs *** */
+    char *device = NULL;
+    char *mountpoint = NULL;
+    char *format = NULL;
+
+    long long size;
+
+    assert(mountlist != NULL);
+    assert(a >= 0);
+    assert(b >= 0);
+
+    mr_asprintf(device, "%s", mountlist->el[a].device);
+    mr_asprintf(mountpoint, "%s", mountlist->el[a].mountpoint);
+    mr_asprintf(format, "%s", mountlist->el[a].format);
+
+    size = mountlist->el[a].size;
+
+    strcpy(mountlist->el[a].device, mountlist->el[b].device);
+    strcpy(mountlist->el[a].mountpoint, mountlist->el[b].mountpoint);
+    strcpy(mountlist->el[a].format, mountlist->el[b].format);
+
+    mountlist->el[a].size = mountlist->el[b].size;
+
+    strcpy(mountlist->el[b].device, device);
+    strcpy(mountlist->el[b].mountpoint, mountpoint);
+    strcpy(mountlist->el[b].format, format);
+
+    mountlist->el[b].size = size;
+    mr_free(device);
+    mr_free(mountpoint);
+    mr_free(format);
+}
+
+
+
+/**
  * Sort the mountlist alphabetically by device.
  * The sorting is done in-place.
@@ -991 +1033 @@
 }
 
-
-/**
- * Swap two entries in the mountlist in-place.
- * @param mountlist The mountlist to swap the entries in.
- * @param a The index number of the first entry.
- * @param b The index number of the second entry.
- */
-void
-swap_mountlist_entries(struct mountlist_itself *mountlist, int a, int b)
-{
-    /*@ mallocs *** */
-    char *device = NULL;
-    char *mountpoint = NULL;
-    char *format = NULL;
-
-    long long size;
-
-    assert(mountlist != NULL);
-    assert(a >= 0);
-    assert(b >= 0);
-
-    mr_asprintf(device, "%s", mountlist->el[a].device);
-    mr_asprintf(mountpoint, "%s", mountlist->el[a].mountpoint);
-    mr_asprintf(format, "%s", mountlist->el[a].format);
-
-    size = mountlist->el[a].size;
-
-    strcpy(mountlist->el[a].device, mountlist->el[b].device);
-    strcpy(mountlist->el[a].mountpoint, mountlist->el[b].mountpoint);
-    strcpy(mountlist->el[a].format, mountlist->el[b].format);
-
-    mountlist->el[a].size = mountlist->el[b].size;
-
-    strcpy(mountlist->el[b].device, device);
-    strcpy(mountlist->el[b].mountpoint, mountpoint);
-    strcpy(mountlist->el[b].format, format);
-
-    mountlist->el[b].size = size;
-    mr_free(device);
-    mr_free(mountpoint);
-    mr_free(format);
-}
-
 /* @} - end of mountlistGroup */