Changeset 2395 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-mountlist.c

Timestamp:

Sep 12, 2009, 2:57:02 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix interface of evaluate_mountlist (remove 2nd param useless) and fix nuke mode which wasn't working.
• Tries to add support for bzip2 and lzma initramfs (preliminary, not tested) for 2.6.30

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-mountlist.c (modified) (4 diffs)

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

@@ -517 +517 @@
  * for each drive, and then spreads the flaws across three lines.
  * @param mountlist The mountlist to evaluate.
- * @param flaws_str_A Where to put the first line listing errors found.
- * @param flaws_str_B Where to put the second line listing errors found.
- * @param flaws_str_C Where to put the third line listing errors found.
- * @return The number of flaws found (0 for success).
+ * @return The flaws string (NULL for success).
  * @see evaluate_drive_within_mountlist
  */
-char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res) {
+char *evaluate_mountlist(struct mountlist_itself *mountlist) {
 
     /*@ buffer *********************************************************** */
@@ -542 +539 @@
     /*@ initialize ******************************************************* */
 
-    *res = 0;
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-
-    mr_asprintf(flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -560 +554 @@
             log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
             tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
-            if (tmp != NULL) {
-                (*res)++;
-            }
         }
         log_msg(8,"Entry: %d (%s)", i, drivelist->el[i].device);
         /* BCO: tmp can be NULL */
         if (tmp != NULL) {
-            log_msg(8,"Adding: %s to %s", tmp, flaws_str);
+            log_msg(8,"Adding: %s to flaws_str", tmp);
             mr_strcat(flaws_str, "%s", tmp);
             mr_free(tmp);
@@ -589 +580 @@
             mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
             mr_strcat(flaws_str, "%s", tmp);
-            log_it(tmp);
+            log_msg(8,"Adding: %s to flaws_str", tmp);
             mr_free(tmp);
-            (*res)++;
         }
         mr_free(curr_mountpoint);