Changeset 3610 in MondoRescue for branches/3.2/mondo/src/common/libmondo-raid.c

Timestamp:

Nov 5, 2016, 6:12:23 PM (7 years ago)

Author:

Bruno Cornec

Message:

• Change interfaces for the call_program_and_get_last_line_of_output and where_is_root_mounted(now return dynamically allocated string)
• removes useless function store_netfs_config

File:

• branches/3.2/mondo/src/common/libmondo-raid.c (modified) (2 diffs)

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

@@ -1007 +1007 @@
             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));
+            strtmp = call_program_and_get_last_line_of_output(cmd);
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
             mr_free(strtmp);
@@ -1014 +1014 @@
             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));
+            strtmp = call_program_and_get_last_line_of_output(cmd);
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
             mr_free(strtmp);