From: Yoav Cohen Date: Wed, 22 May 2019 15:34:17 +0000 (+0300) Subject: fix json print for list-subsys command X-Git-Tag: v1.9~54^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2a2d5b438cbd4c345cf6a4a79ad81e3413f9cc8f;p=users%2Fsagi%2Fnvme-cli.git fix json print for list-subsys command The bug was the instead of adding paths to to the subsystem object it wass added as a new subsystem --- diff --git a/nvme-print.c b/nvme-print.c index 43488efe..2c4822e7 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -2875,7 +2875,6 @@ void json_print_nvme_subsystem_list(struct subsys_list_item *slist, int n) struct json_object *subsystem_attrs; struct json_array *paths; struct json_object *path_attrs; - struct json_object *path_object; int i, j; root = json_create_object(); @@ -2892,7 +2891,6 @@ void json_print_nvme_subsystem_list(struct subsys_list_item *slist, int n) json_array_add_value_object(subsystems, subsystem_attrs); paths = json_create_array(); - path_object = json_create_object(); for (j = 0; j < slist[i].nctrls; j++) { path_attrs = json_create_object(); @@ -2911,9 +2909,7 @@ void json_print_nvme_subsystem_list(struct subsys_list_item *slist, int n) json_array_add_value_object(paths, path_attrs); } if (j) { - json_object_add_value_array(path_object, "Paths", - paths); - json_array_add_value_object(subsystems, path_object); + json_object_add_value_array(subsystem_attrs, "Paths", paths); } }