Changeset 2385 in MondoRescue

Timestamp:

Sep 10, 2009, 1:10:21 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove separate function look_for_duplicate_mountpoints used only once and whose interface created problems with caller

(Backport from 2.2.9)

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-mountlist-EXT.h (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (3 diffs)
• common/libmondo-mountlist.h (modified) (1 diff)
• mondorestore/mondo-rstr-newt.h (modified) (1 diff)

branches/2.2.10/mondo/src/common/libmondo-mountlist-EXT.h

@@ -4 +4 @@
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);
-extern int look_for_duplicate_mountpoints(struct mountlist_itself
-                                          *mountlist, char *flaws_str);
 extern int make_list_of_drives_in_mountlist(struct mountlist_itself *,
                                             struct list_of_disks *);

branches/2.2.10/mondo/src/common/libmondo-mountlist.c

@@ -530 +530 @@
     char *flaws_str = NULL;
 
+    int currline = 0;
+    int copies = 0;
+    int last_copy = 0;
+
+    /*@ buffetr ********************************************************* */
+    char *curr_mountpoint = NULL;
+
     /*@ int ************************************************************** */
     int i = 0;
@@ -565 +572 @@
         }
     }
-    *res += look_for_duplicate_mountpoints(mountlist, flaws_str);
-    return(flaws_str);
-}
-
-
-/**
- * Find the index number of @p device in the mountlist.
- * The device given must match @p mountlist->el[N].device exactly, case-sensitive.
- * @param mountlist The mountlist to search in.
- * @param device The device to search for.
- * @return The zero-based index of the device, or -1 if it could not be found.
- */
-int
-find_device_in_mountlist(struct mountlist_itself *mountlist, char *device)
-{
-
-    /*@ int ************************************************************** */
-    int i = 0;
-
-    assert(mountlist != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    for (i = 0;
-         i < mountlist->entries
-         && strcmp(mountlist->el[i].device, device) != 0; i++);
-
-    if (i == mountlist->entries) {
-        return (-1);
-    } else {
-        return (i);
-    }
-}
-
-
-/**
- * Look for duplicate mountpoints in @p mountlist.
- * @param mountlist The mountlist to check.
- * @param flaws_str The flaws string to append the results to.
- * @return The number of mountpoints that have duplicates, or 0 for success.
- */
-int
-look_for_duplicate_mountpoints(struct mountlist_itself *mountlist, char *flaws_str)
-{
-
-    /*@ int ************************************************************* */
-    int res = 0;
-    int currline = 0;
-    int i = 0;
-    int copies = 0;
-    int last_copy = 0;
-
-    /*@ buffetr ********************************************************* */
-    char *curr_mountpoint = NULL;
-    char *tmp = NULL;
-
-    assert(mountlist != NULL);
-    assert(flaws_str != NULL);
+
+    /* Look for duplicate mountpoints in mountlist. */
 
     for (currline = 0; currline < mountlist->entries; currline++) {
         mr_asprintf(curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
-        for (i = 0, copies = 0, last_copy = -1; i < mountlist->entries;
-             i++) {
+        for (i = 0, copies = 0, last_copy = -1; i < mountlist->entries; i++) {
             if (!strcmp(mountlist->el[i].mountpoint, curr_mountpoint)
                 && strcmp(mountlist->el[i].mountpoint, "lvm")
@@ -639 +591 @@
             log_it(tmp);
             mr_free(tmp);
-            res++;
+            (*res)++;
         }
         mr_free(curr_mountpoint);
     }
-    return (res);
+
+    return(flaws_str);
+}
+
+
+/**
+ * Find the index number of @p device in the mountlist.
+ * The device given must match @p mountlist->el[N].device exactly, case-sensitive.
+ * @param mountlist The mountlist to search in.
+ * @param device The device to search for.
+ * @return The zero-based index of the device, or -1 if it could not be found.
+ */
+int
+find_device_in_mountlist(struct mountlist_itself *mountlist, char *device)
+{
+
+    /*@ int ************************************************************** */
+    int i = 0;
+
+    assert(mountlist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    for (i = 0;
+         i < mountlist->entries
+         && strcmp(mountlist->el[i].device, device) != 0; i++);
+
+    if (i == mountlist->entries) {
+        return (-1);
+    } else {
+        return (i);
+    }
 }
 

branches/2.2.10/mondo/src/common/libmondo-mountlist.h

@@ -7 +7 @@
 int find_device_in_mountlist(struct mountlist_itself *mountlist,
                              char *device);
-int look_for_duplicate_mountpoints(struct mountlist_itself *mountlist,
-                                   char *flaws_str);
 int make_list_of_drives_in_mountlist(struct mountlist_itself *,
                                      struct list_of_disks *);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -148 +148 @@
 void log_file_end_to_screen(char *, char *);
 void log_to_screen(const char *fmt, ...);
-int look_for_duplicate_mountpoints(struct mountlist_itself *, char *);
 void make_list_of_unallocated_raid_partitions(struct mountlist_itself *,
                                               struct mountlist_itself *,