Changeset 2394 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

Sep 12, 2009, 2:53:02 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix interface of evaluate_mountlist (remove 2nd param useless) and fix nuke mode which wasn't working.

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-mountlist-EXT.h (modified) (1 diff)
• libmondo-mountlist.c (modified) (4 diffs)
• libmondo-mountlist.h (modified) (1 diff)

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

@@ -1 +1 @@
 /* libmondo-mountlist-EXT.h */
 
-extern char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);
+extern char *evaluate_mountlist(struct mountlist_itself *mountlist);
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);

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

@@ -498 +498 @@
  * 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 *********************************************************** */
@@ -523 +520 @@
     /*@ 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);
@@ -543 +537 @@
             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);
             paranoid_free(tmp);
@@ -571 +562 @@
             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);
             paranoid_free(tmp);
-            (*res)++;
         }
         paranoid_free(curr_mountpoint);

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

@@ -4 +4 @@
 
 
-char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);
+char *evaluate_mountlist(struct mountlist_itself *mountlist);
 int find_device_in_mountlist(struct mountlist_itself *mountlist,
                              char *device);