Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-raid.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/common/libmondo-raid.c (modified) (10 diffs)

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

@@ -51 +51 @@
     int res;
 
-    mr_asprintf(&command, "grep \"");
+    mr_asprintf(command, "grep \"");
     if (raidno == -1) {
         mr_strcat(command, "linear");
@@ -198 +198 @@
     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);
@@ -587 +587 @@
     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);
@@ -739 +739 @@
         }
         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);
@@ -1032 +1032 @@
             }
             // get RAID device name
-            mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+            mr_asprintf(strtmp,"%s%s", device_prefix, token);
             strncpy(raidlist->el[raidlist->entries].raid_device, strtmp, 63);
             raidlist->el[raidlist->entries].raid_device[63] = '\0';
@@ -1040 +1040 @@
             v = raidlist->el[raidlist->entries].additional_vars.entries;
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "UUID");
-            mr_asprintf(&cmd,"mdadm --detail %s | grep UUID | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
-            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            mr_asprintf(cmd,"mdadm --detail %s | grep UUID | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
             mr_free(strtmp);
@@ -1047 +1047 @@
             // store the Version value in the additional_vars structure
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "Version");
-            mr_asprintf(&cmd,"mdadm --detail %s | grep Version | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
-            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            mr_asprintf(cmd,"mdadm --detail %s | grep Version | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
             mr_free(strtmp);
@@ -1128 +1128 @@
                 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);
                     mr_free(strtmp);
@@ -1135 +1135 @@
                 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);
                     mr_free(strtmp);
@@ -1142 +1142 @@
                 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);
                     mr_free(strtmp);