Changeset 2202 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-mountlist.c

Timestamp:

May 13, 2009, 4:34:00 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove useless function look_for_weird_formats
• Adds a test program for mountlist management to find a seg. fault bug when using a large mountlist file

File:

• branches/2.2.9/mondo/src/common/libmondo-mountlist.c (modified) (3 diffs)

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

@@ -508 +508 @@
     /*@ buffer *********************************************************** */
     struct list_of_disks *drivelist;
-    char *tmp;
-    char *flaws_str;
+    char *tmp = NULL;
+    char *flaws_str = NULL;
 
     /*@ int ************************************************************** */
@@ -547 +547 @@
     }
     res += look_for_duplicate_mountpoints(mountlist, flaws_str);
-/*  res+=look_for_weird_formats(mountlist,flaws_str); .. not necessary, now that we can check to see
- which formarts are actually _supported_ by the kernel */
-    /* log_it(flaws_str); */
     return (spread_flaws_across_three_lines
             (flaws_str, flaws_str_A, flaws_str_B, flaws_str_C, res));
@@ -644 +641 @@
     return (res);
 }
-
-/**
- * Look for strange formats. Does not respect /proc/filesystems.
- * @param mountlist The mountlist to check.
- * @param flaws_str The flaws string to append the results to.
- * @return The number of weird formats found, or 0 for success.
- * @bug Seems orphaned; please remove.
- */
-int
-look_for_weird_formats(struct mountlist_itself *mountlist, char *flaws_str)
-{
-
-    /*@ int ************************************************************* */
-    int i = 0;
-    int res = 0;
-
-    /*@ buffers ********************************************************* */
-    char *tmp;
-    char *format_sz;
-
-    malloc_string(tmp);
-    malloc_string(format_sz);
-
-    assert(mountlist != NULL);
-    assert(flaws_str != NULL);
-
-    for (i = 0; i < mountlist->entries; i++) {
-        sprintf(format_sz, " %s ", mountlist->el[i].format);
-        if (!strstr(SANE_FORMATS, format_sz)
-            && strcmp(mountlist->el[i].mountpoint, "image") != 0) {
-            sprintf(tmp, " %s has unknown format.",
-                    mountlist->el[i].device);
-            log_it(tmp);
-            strcat(flaws_str, tmp);
-            res++;
-        } else if ((!strcmp(mountlist->el[i].format, "swap")
-                    && strcmp(mountlist->el[i].mountpoint, "swap")
-                    && strcmp(mountlist->el[i].mountpoint, "none"))
-                   || (strcmp(mountlist->el[i].format, "swap")
-                       && !strcmp(mountlist->el[i].mountpoint, "swap")
-                       && !strcmp(mountlist->el[i].mountpoint, "none"))) {
-            sprintf(tmp, " %s is half-swap.", mountlist->el[i].device);
-            log_it(tmp);
-            strcat(flaws_str, tmp);
-            res++;
-        }
-    }
-    paranoid_free(tmp);
-    paranoid_free(format_sz);
-    return (res);
-}
-