]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
fix json print for list-subsys command
authorYoav Cohen <yoav@excelero.com>
Wed, 22 May 2019 15:34:17 +0000 (18:34 +0300)
committerYoav Cohen <yoav@excelero.com>
Wed, 22 May 2019 15:37:33 +0000 (18:37 +0300)
The bug was the instead of adding paths to to the subsystem object it
wass added as a new subsystem

nvme-print.c

index 43488efe734d7fa67037908dacb985d6d745f154..2c4822e7febdb700148e4d869ad68fd297df0a86 100644 (file)
@@ -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);
                }
 
        }