Changeset 2394 in MondoRescue for branches/2.2.9

Timestamp:

Sep 12, 2009, 2:53: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.

Location:

branches/2.2.9/mondo

Files:

• src/common/libmondo-mountlist-EXT.h (modified) (1 diff)
• src/common/libmondo-mountlist.c (modified) (4 diffs)
• src/common/libmondo-mountlist.h (modified) (1 diff)
• src/mondorestore/mondo-rstr-newt.c (modified) (3 diffs)
• src/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• src/mondorestore/mondorestore.c (modified) (2 diffs)
• src/mondorestore/mr-externs.h (modified) (1 diff)
• test/test-mountlist.c (modified) (2 diffs)

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);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1933 +1933 @@
     /** int **************************************************************/
     int i = 0;
-    int res = 0;
     int currline = 0;
     int finished = FALSE;
@@ -1975 +1974 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        flaws_str = evaluate_mountlist(mountlist, &res);
+        flaws_str = evaluate_mountlist(mountlist);
         if (strlen(flaws_str) > 0) {
             mr_asprintf(&flaws_str_A, "%s", flaws_str + 1);
@@ -2006 +2005 @@
 
         if (b_res == bOK) {
-            flaws_str = evaluate_mountlist(mountlist, &res);
-            mr_free(flaws_str);
-            if (!res) {
+            flaws_str = evaluate_mountlist(mountlist);
+            if (flaws_str != NULL) {
+                mr_free(flaws_str);
                 finished =
                     ask_me_yes_or_no

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

@@ -137 +137 @@
                    struct raidlist_itself *);
 void edit_raidrec_additional_vars(struct raid_device_record *);
-char *evaluate_mountlist(struct mountlist_itself *, int *);
+char *evaluate_mountlist(struct mountlist_itself *);
 int find_device_in_mountlist(struct mountlist_itself *, char *);
 int find_next_free_index_in_disklist(struct list_of_disks *);

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -793 +793 @@
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
-    flaws_str = evaluate_mountlist(mountlist, &res);
-    if (!res) {
+    flaws_str = evaluate_mountlist(mountlist);
+    if (flaws_str != NULL) {
         sprintf(tmp,
                 "Mountlist analyzed. Result: \"%s\" Switch to Interactive Mode?",
@@ -806 +806 @@
         }
     }
-    mr_free(flaws_str);
 
     save_mountlist_to_disk(mountlist, g_mountlist_fname);

branches/2.2.9/mondo/src/mondorestore/mr-externs.h

@@ -109 +109 @@
 extern bool g_restoring_live_from_netfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);
-extern char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);
+extern char *evaluate_mountlist(struct mountlist_itself *mountlist);
 
 

branches/2.2.9/mondo/test/test-mountlist.c

@@ -50 +50 @@
 struct mountlist_itself *mountlist = NULL;
 struct raidlist_itself *raidlist = NULL;
-int ret = 0;
 char *flaws_str = NULL;
 
@@ -80 +79 @@
 log_it("after edit_mountlist");
 
-flaws_str = evaluate_mountlist(mountlist, &ret);
+flaws_str = evaluate_mountlist(mountlist);
 log_it("after evaluate_mountlist");
 mr_free(flaws_str);