Changeset 689 in MondoRescue for trunk/mondo/mondo/common/libmondo-raid.c

Timestamp:

Jul 17, 2006, 7:43:58 PM (18 years ago)

Author:

bcornec

Message:

Still other memory management improvements ( I hope :-)

File:

• trunk/mondo/mondo/common/libmondo-raid.c (modified) (10 diffs)

trunk/mondo/mondo/common/libmondo-raid.c

@@ -403 +403 @@
  * @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)
+int get_next_raidtab_line(FILE *fin, char *label, char *value)
 {
     char *incoming = NULL;
-    char *p;
+    char *p = NULL;
     size_t n = 0;
 
     assert(fin != NULL);
-    assert(label != NULL);
-    assert(value != NULL);
-
-    label[0] = value[0] = '\0';
+
     if (feof(fin)) {
         return (1);
@@ -429 +426 @@
             p++;
         }
-        strcpy(label, incoming);
-        strcpy(value, p);
-        paranoid_free(incoming);
+        label = incoming;
+        value = p;
         return (0);
     }
@@ -576 +572 @@
                                char *fname)
 {
-    FILE *fin;
-    char *label;
-    char *value;
+    FILE *fin = NULL;
+    char *label = NULL;
+    char *value = NULL;
     int items;
     int v;
@@ -596 +592 @@
     items = 0;
     log_it("Loading raidtab...");
-    malloc_string(label);
-    malloc_string(value);
     get_next_raidtab_line(fin, label, value);
     while (!feof(fin)) {
@@ -605 +599 @@
         /* find the 'raiddev' entry, indicating the start of the block of info */
         while (!feof(fin) && strcmp(label, "raiddev")) {
-            strcpy(raidlist->el[items].additional_vars.el[v].label, label);
-            strcpy(raidlist->el[items].additional_vars.el[v].value, value);
+            raidlist->el[items].additional_vars.el[v].label = label;
+            raidlist->el[items].additional_vars.el[v].value = value;
             v++;
             get_next_raidtab_line(fin, label, value);
@@ -616 +610 @@
         }
         log_msg(2, "Record #%d (%s) found", items, value);
-        strcpy(raidlist->el[items].raid_device, value);
+        raidlist->el[items].raid_device = value;
         for (get_next_raidtab_line(fin, label, value);
              !feof(fin) && strcmp(label, "raiddev");
@@ -628 +622 @@
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(label);
-    paranoid_free(value);
     return (0);
 }
@@ -644 +636 @@
  */
 void
-process_raidtab_line(FILE * fin,
+process_raidtab_line(FILE *fin,
                      struct raid_device_record *raidrec,
                      char *label, char *value)
@@ -650 +642 @@
 
     /*@ add mallocs * */
-    char *tmp;
-    char *labelB;
-    char *valueB;
-
-    struct list_of_disks *disklist;
-    int index;
-    int v;
-
-    malloc_string(labelB);
-    malloc_string(valueB);
+    char *tmp = NULL;
+    char *labelB = NULL;
+    char *valueB = NULL;
+
+    struct list_of_disks *disklist = NULL;
+    int index = 0;
+    int v = 0;
+
     assert(fin != NULL);
     assert(raidrec != NULL);
@@ -716 +706 @@
             add_disk_to_raid_device(disklist, value, index);
         }
+        paranoid_free(labelB);
+        paranoid_free(valueB);
     } else {
         v = raidrec->additional_vars.entries;
-        strcpy(raidrec->additional_vars.el[v].label, label);
-        strcpy(raidrec->additional_vars.el[v].value, value);
+        raidrec->additional_vars.el[v].label = label;
+        raidrec->additional_vars.el[v].value = value;
         raidrec->additional_vars.entries = ++v;
     }
-    paranoid_free(labelB);
-    paranoid_free(valueB);
 }
 #endif