Changeset 2407 in MondoRescue

Timestamp:

Sep 18, 2009, 1:05:06 AM (15 years ago)

Author:

Bruno Cornec

Message:

Modify the get_netx_raitab_line function prototype to reduce static memory allocation

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-raid.c (modified) (12 diffs)

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

@@ -504 +504 @@
     /*@ buffer ************************************************************ */
     char *tmp = NULL;
-    char *tmp1 = NULL;
     char *tmp2 = NULL;
     char *command = NULL;
@@ -2491 +2490 @@
  * @return the CD-R(W) device checked or NULL
  */
-char *interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev) {
+char *interrogate_disk_currently_in_cdrw_drive() {
     char *cdrecord = NULL;
     char *cdrw_dev = NULL;

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

@@ -425 +425 @@
  * @return 0 if the line was read and stored successfully, 1 if we're at end of file.
  */
-int get_next_raidtab_line(FILE * fin, char *label, char *value)
+void get_next_raidtab_line(FILE * fin, char **label, char **value)
 {
     char *incoming = NULL;
@@ -431 +431 @@
 
     assert(fin != NULL);
-    assert(label != NULL);
-    assert(value != NULL);
-
-    label[0] = value[0] = '\0';
+
     if (feof(fin)) {
-        return (1);
+        return;
     }
     for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
@@ -449 +446 @@
             p++;
         }
-        strcpy(label, incoming);
-        strcpy(value, p);
+        mr_asprintf(*label, "%s", incoming);
+        mr_asprintf(*value, "%s", p);
         mr_free(incoming);
-        return (0);
+        return;
     }
     mr_free(incoming);
-    return (1);
+    return;
 }
 
@@ -587 +584 @@
 #else
 
-int load_raidtab_into_raidlist(struct raidlist_itself *raidlist,
-                               char *fname)
-{
-    FILE *fin;
-    char *label;
-    char *value;
+int load_raidtab_into_raidlist(struct raidlist_itself *raidlist, char *fname) {
+
+    FILE *fin = NULL;
+    char *label = NULL;
+    char *value = NULL;
     int items;
     int v;
@@ -610 +606 @@
     items = 0;
     log_it("Loading raidtab...");
-    malloc_string(label);
-    malloc_string(value);
-    get_next_raidtab_line(fin, label, value);
+    get_next_raidtab_line(fin, &label, &value);
     while (!feof(fin)) {
         log_msg(1, "Looking for raid record #%d", items);
@@ -622 +616 @@
             strcpy(raidlist->el[items].additional_vars.el[v].value, value);
             v++;
-            get_next_raidtab_line(fin, label, value);
+            mr_free(label);
+            mr_free(value);
+            get_next_raidtab_line(fin, &label, &value);
         }
         raidlist->el[items].additional_vars.entries = v;
@@ -631 +627 @@
         log_msg(2, "Record #%d (%s) found", items, value);
         strcpy(raidlist->el[items].raid_device, value);
-        for (get_next_raidtab_line(fin, label, value);
-             !feof(fin) && strcmp(label, "raiddev");
-             get_next_raidtab_line(fin, label, value)) {
+        mr_free(label);
+        mr_free(value);
+        for (get_next_raidtab_line(fin, &label, &value); !feof(fin) && strcmp(label, "raiddev"); get_next_raidtab_line(fin, &label, &value)) {
             process_raidtab_line(fin, &raidlist->el[items], label, value);
-        }
+            mr_free(label);
+            mr_free(value);
+        }
+        mr_free(label);
+        mr_free(value);
         items++;
     }
+    mr_free(label);
+    mr_free(value);
     paranoid_fclose(fin);
     raidlist->entries = items;
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(label);
-    paranoid_free(value);
     return (0);
 }
@@ -670 +670 @@
 
     /*@ add mallocs * */
-    char *labelB;
-    char *valueB;
+    char *labelB = NULL;
+    char *valueB = NULL;
 
     struct list_of_disks *disklist;
@@ -677 +677 @@
     int v;
 
-    malloc_string(labelB);
-    malloc_string(valueB);
     assert(fin != NULL);
     assert(raidrec != NULL);
@@ -713 +711 @@
         }
     } else if (!strcmp(label, "device")) {
-        get_next_raidtab_line(fin, labelB, valueB);
+        get_next_raidtab_line(fin, &labelB, &valueB);
         if (!strcmp(labelB, "raid-disk")) {
             disklist = &raidrec->data_disks;
@@ -731 +729 @@
             add_disk_to_raid_device(disklist, value, index);
         }
+        mr_free(labelB);
+        mr_free(valueB);
     } else {
         v = raidrec->additional_vars.entries;
@@ -737 +737 @@
         raidrec->additional_vars.entries = ++v;
     }
-    paranoid_free(labelB);
-    paranoid_free(valueB);
 }
 #endif