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

Timestamp:

Aug 18, 2009, 3:05:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3334@localhost: bruno | 2009-08-08 12:17:37 +0200

• Change mr_asprintf interface to pass only the char * (makes bkpinfo usage more easy)

File:

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

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

@@ -50 +50 @@
     int res;
 
-    mr_asprintf(&command, "grep \"");
+    mr_asprintf(command, "grep \"");
     if (raidno == -1) {
         mr_strcat(command, "linear");
@@ -197 +197 @@
     assert(label != NULL);
 
-    mr_asprintf(&sz_value, "%d", value);
+    mr_asprintf(sz_value, "%d", value);
     strcpy(raidrec->additional_vars.el[lino].label, label);
     strcpy(raidrec->additional_vars.el[lino].value, sz_value);
@@ -585 +585 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    mr_asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
+    mr_asprintf(tmp1, "%d RAID devices in raidtab", raidlist->entries);
     log_it(tmp1);
     mr_free(tmp1);
@@ -744 +744 @@
         }
         if (!disklist) {
-            mr_asprintf(&tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
+            mr_asprintf(tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
             log_it(tmp);
             mr_free(tmp);
@@ -1006 +1006 @@
     pos = string;
     while (*pos == ' ') pos += 1;
-    mr_asprintf(&strtmp, "%s", pos);
+    mr_asprintf(strtmp, "%s", pos);
     strcpy(string, strtmp);
     paranoid_free(strtmp);
@@ -1027 +1027 @@
     token = mr_strtok(string, delims, &lastpos);
     // get RAID device name
-    mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+    mr_asprintf(strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
     paranoid_free(strtmp);
@@ -1086 +1086 @@
       case ' ': // normal data disks
         raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+        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);
@@ -1093 +1093 @@
       case 'S': // spare disks
         raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+        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);
@@ -1100 +1100 @@
       case 'F': // failed disks
         raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+        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);