Changeset 2356 in MondoRescue

Timestamp:

Aug 29, 2009, 1:00:03 AM (15 years ago)

Author:

Bruno Cornec

Message:

Remove function spread_flaws_across_three_lines and expand it at the single place where it was useful, and fix memory allocation issues in it.
(backport from 2.2.9)

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-string-EXT.h (modified) (1 diff)
• common/libmondo-string.c (modified) (1 diff)
• common/libmondo-string.h (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.h (modified) (1 diff)

branches/2.2.10/mondo/src/common/libmondo-string-EXT.h

@@ -19 +19 @@
                          char *s);
 extern int special_dot_char(int i);
-extern void spread_flaws_across_three_lines(char *flaws_str,
-                                            char *flaws_str_A,
-                                            char *flaws_str_B,
-                                            char *flaws_str_C);
 extern int strcmp_inc_numbers(char *stringA, char *stringB);
 extern char *strip_afio_output_line(char *input);

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

@@ -589 +589 @@
     return ('.');
 }
-
-
-
-
-/**
- * Wrap @p flaws_str across three lines. The first two are no more than 74 characters wide.
- * @param flaws_str The original string to split.
- * @param flaws_str_A Where to put the first 74-or-less characters.
- * @param flaws_str_B Where to put the second 74-or-less characters.
- * @param flaws_str_C Where to put the rest.
- */
-void
-spread_flaws_across_three_lines(char *flaws_str, char *flaws_str_A,
-                                char *flaws_str_B, char *flaws_str_C)
-{
-
-    /*@ int ************************************************************* */
-    int i = 0;
-
-    /*@ initialize ****************************************************** */
-    assert(flaws_str != NULL);
-
-    if (strlen(flaws_str) > 0) {
-        mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
-    }
-    if (strlen(flaws_str_A) >= 74) {
-        for (i = 74; flaws_str_A[i] != ' '; i--);
-        mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
-        flaws_str_A[i] = '\0';
-    }
-    if (strlen(flaws_str_B) >= 74) {
-        for (i = 74; flaws_str_B[i] != ' '; i--);
-        mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
-        flaws_str_B[i] = '\0';
-    }
-}
-
 
 

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

@@ -17 +17 @@
 char *slice_fname(long bigfileno, long sliceno, char *path, char *s);
 int special_dot_char(int i);
-void spread_flaws_across_three_lines(char *flaws_str, char *flaws_str_A,
-                                     char *flaws_str_B, char *flaws_str_C);
 int strcmp_inc_numbers(char *stringA, char *stringB);
 char *strip_afio_output_line(char *input);

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

@@ -1966 +1966 @@
     while (!finished) {
         flaws_str = evaluate_mountlist(mountlist, &res);
-        spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C);
-
+        if (strlen(flaws_str) > 0) {
+            mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
+        } else {
+            mr_asprintf(flaws_str_A, "");
+        }
+        if (strlen(flaws_str_A) >= 74) {
+            for (i = 74; flaws_str_A[i] != ' '; i--);
+            mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
+            flaws_str_A[i] = '\0';
+        } else {
+            mr_asprintf(flaws_str_B, "");
+        }
+        if (strlen(flaws_str_B) >= 74) {
+            for (i = 74; flaws_str_B[i] != ' '; i--);
+            mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
+            flaws_str_B[i] = '\0';
+        } else {
+            mr_asprintf(flaws_str_C, "");
+        }
         mr_free(flaws_str);
 

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

@@ -180 +180 @@
 void setup_newt_stuff(void);
 long size_of_specific_device(struct mountlist_itself *, char *);
-void spread_flaws_across_three_lines(char *, char *, char *, char *);
 char *turn_raid_level_number_to_string(int);
 void update_evalcall_form(int);