Changeset 3185 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)

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

@@ -1974 +1974 @@
         /* flaws_str can be NULL */
         if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) {
-            mr_asprintf(&flaws_str_A, "");
+            mr_asprintf(flaws_str_A, "");
         } else {
-            mr_asprintf(&flaws_str_A, "%s", flaws_str + 1);
+            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);
+            mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
             flaws_str_A[i] = '\0';
         } else {
-            mr_asprintf(&flaws_str_B, "");
+            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);
+            mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
             flaws_str_B[i] = '\0';
         } else {
-            mr_asprintf(&flaws_str_C, "");
+            mr_asprintf(flaws_str_C, "");
         }