From 8af6d813f8022e218c4ccb19b23bcf7732f726f8 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 1 Feb 2019 14:56:31 +0900 Subject: [PATCH] iscsi: Use spdk_json_write_named_* APIs throughout Change-Id: I548ffa0b002f9bc233d64d8a681d12aef1fdf586 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/442948 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker --- lib/iscsi/iscsi_rpc.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 6c9a002cf..ef1f1d46d 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -929,11 +929,9 @@ spdk_rpc_get_iscsi_connections(struct spdk_jsonrpc_request *request, spdk_json_write_object_begin(w); - spdk_json_write_name(w, "id"); - spdk_json_write_int32(w, c->id); + spdk_json_write_named_int32(w, "id", c->id); - spdk_json_write_name(w, "cid"); - spdk_json_write_int32(w, c->cid); + spdk_json_write_named_int32(w, "cid", c->cid); /* * If we try to return data for a connection that has not @@ -946,20 +944,15 @@ spdk_rpc_get_iscsi_connections(struct spdk_jsonrpc_request *request, } else { tsih = c->sess->tsih; } - spdk_json_write_name(w, "tsih"); - spdk_json_write_int32(w, tsih); + spdk_json_write_named_int32(w, "tsih", tsih); - spdk_json_write_name(w, "lcore_id"); - spdk_json_write_int32(w, c->lcore); + spdk_json_write_named_int32(w, "lcore_id", c->lcore); - spdk_json_write_name(w, "initiator_addr"); - spdk_json_write_string(w, c->initiator_addr); + spdk_json_write_named_string(w, "initiator_addr", c->initiator_addr); - spdk_json_write_name(w, "target_addr"); - spdk_json_write_string(w, c->target_addr); + spdk_json_write_named_string(w, "target_addr", c->target_addr); - spdk_json_write_name(w, "target_node_name"); - spdk_json_write_string(w, c->target_short_name); + spdk_json_write_named_string(w, "target_node_name", c->target_short_name); spdk_json_write_object_end(w); }