Changeset 2352 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-string.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-string.c (modified) (3 diffs)

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

@@ -599 +599 @@
  * @param flaws_str_B Where to put the second 74-or-less characters.
  * @param flaws_str_C Where to put the rest.
- * @param res The result of the original evaluate_mountlist() operation.
- * @return TRUE if res == 0, FALSE otherwise.
- */
-bool
+ */
+void
 spread_flaws_across_three_lines(char *flaws_str, char *flaws_str_A,
-                                char *flaws_str_B, char *flaws_str_C,
-                                int res)
+                                char *flaws_str_B, char *flaws_str_C)
 {
 
@@ -612 +609 @@
 
     /*@ initialize ****************************************************** */
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
     assert(flaws_str != NULL);
 
-    if (!res && !strlen(flaws_str)) {
-        return (TRUE);
-    }
     if (strlen(flaws_str) > 0) {
-        paranoid_free(flaws_str_A);
         mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
     }
     if (strlen(flaws_str_A) >= 74) {
         for (i = 74; flaws_str_A[i] != ' '; i--);
-        paranoid_free(flaws_str_B);
         mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
         flaws_str_A[i] = '\0';
@@ -632 +621 @@
     if (strlen(flaws_str_B) >= 74) {
         for (i = 74; flaws_str_B[i] != ' '; i--);
-        paranoid_free(flaws_str_C);
         mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
         flaws_str_B[i] = '\0';
-    }
-    if (res) {
-        return (FALSE);
-    } else {
-        return (TRUE);
     }
 }