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

Timestamp:

Aug 28, 2009, 2:46:29 AM (15 years ago)

Author:

Bruno Cornec

Message:

Change inerface of evaluate_mountlist and spread_flaws_across_three_lines in order to solve bugs linked to strings management in these functions. May fix a restoration crash seen by some customers (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

@@ -519 +519 @@
  * @see evaluate_drive_within_mountlist
  */
-int
-evaluate_mountlist(struct mountlist_itself *mountlist, char *flaws_str_A,
-                   char *flaws_str_B, char *flaws_str_C)
-{
+char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res) {
 
     /*@ buffer *********************************************************** */
@@ -531 +528 @@
     /*@ int ************************************************************** */
     int i = 0;
-    int res = 0;
 
     /*@ initialize ******************************************************* */
 
+    *res = 0;
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
 
     mr_asprintf(flaws_str, "%s", "");
@@ -556 +550 @@
             tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
             if (tmp == NULL) {
-                res++;
+                (*res)++;
             }
         }
@@ -567 +561 @@
         }
     }
-    res += look_for_duplicate_mountpoints(mountlist, flaws_str);
-    res = spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C,res);
-    mr_free(flaws_str);
-    return(res);
+    *res += look_for_duplicate_mountpoints(mountlist, flaws_str);
+    return(flaws_str);
 }