Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-raid.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-raid.c (modified) (5 diffs)

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

@@ -427 +427 @@
 int get_next_raidtab_line(FILE * fin, char *label, char *value)
 {
-    char *incoming;
+    char *incoming = NULL;
     char *p;
 
-    malloc_string(incoming);
     assert(fin != NULL);
     assert(label != NULL);
@@ -437 +436 @@
     label[0] = value[0] = '\0';
     if (feof(fin)) {
-        paranoid_free(incoming);
         return (1);
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        strip_spaces(incoming);
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+        mr_strip_spaces(incoming);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {
+            mr_free(incoming);
             continue;
         }
@@ -453 +451 @@
         strcpy(label, incoming);
         strcpy(value, p);
-        paranoid_free(incoming);
+        mr_free(incoming);
         return (0);
     }
+    mr_free(incoming);
     return (1);
 }
@@ -805 +804 @@
     static char *argv[64];
     char **ap;
-    char *line = (char *) malloc(MAX_STR_LEN);
-    if (!line)
-        errx(1,
-             "unable to allocate %i bytes of memory for `char *line' at %s:%i",
-             MAX_STR_LEN, __FILE__, __LINE__);
-    (void) fgets(line, MAX_STR_LEN, f);
+    char *line = NULL;
+
+    mr_getline(line, f);
     if (feof(f)) {
         log_it("[GNVCL] Uh... I reached the EOF.");
@@ -822 +818 @@
             cnt++;
         }
+    mr_free(line);
 
     if (strchr(argv[cnt - 1], '\n')) {