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

Timestamp:

Aug 18, 2009, 3:13:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3335@localhost: bruno | 2009-08-08 23:04:12 +0200

• Change mr_asprintf to avoid the need of pointer and be consistent with the other mr_mem functions

File:

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

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

@@ -471 +471 @@
 {
     FILE *fin;
-    char *tmp1 = NULL;
     int items;
 
@@ -585 +584 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    mr_asprintf(tmp1, "%d RAID devices in raidtab", raidlist->entries);
-    log_it(tmp1);
-    mr_free(tmp1);
+    log_it("%d RAID devices in raidtab", raidlist->entries);
     return (0);
 }
@@ -687 +684 @@
 
     /*@ add mallocs * */
-    char *tmp = NULL;
     char *labelB;
     char *valueB;
@@ -744 +740 @@
         }
         if (!disklist) {
-            mr_asprintf(tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
         } else {
             index = atoi(valueB);
@@ -1008 +1002 @@
     mr_asprintf(strtmp, "%s", pos);
     strcpy(string, strtmp);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -1029 +1023 @@
     mr_asprintf(strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
     mr_free(token);
     // skip ':' and status
@@ -1088 +1082 @@
         mr_asprintf(strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].data_disks.entries++;
         break;
@@ -1095 +1089 @@
         mr_asprintf(strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].spare_disks.entries++;
         break;
@@ -1102 +1096 @@
         mr_asprintf(strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].failed_disks.entries++;
         log_it("At least one failed disk found in RAID array.\n");