d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jsonrpc: Use spdk_json_write_named_* APIs throughout

Browse Source 
Change-Id: I59ef8c96a172162c153d23d89236a26beb164ece
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/442947
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-02-01 14:53:43 +09:00 committed by Darek Stojaczyk
parent fb31cd3a0c
commit 73f79a5c56
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/jsonrpc/jsonrpc_server.c
View File

@ -247,8 +247,7 @@ begin_response(struct spdk_jsonrpc_request *request)
}
spdk_json_write_object_begin(w);
spdk_json_write_name(w, "jsonrpc");
spdk_json_write_string(w, "2.0");
spdk_json_write_named_string(w, "jsonrpc", "2.0");
spdk_json_write_name(w, "id");
if (request->id) {
@ -332,12 +331,9 @@ spdk_jsonrpc_send_error_response(struct spdk_jsonrpc_request *request,
return;
}
spdk_json_write_name(w, "error");
spdk_json_write_object_begin(w);
spdk_json_write_name(w, "code");
spdk_json_write_int32(w, error_code);
spdk_json_write_name(w, "message");
spdk_json_write_string(w, msg);
spdk_json_write_named_object_begin(w, "error");
spdk_json_write_named_int32(w, "code", error_code);
spdk_json_write_named_string(w, "message", msg);
spdk_json_write_object_end(w);
end_response(request, w);
@ -356,13 +352,10 @@ spdk_jsonrpc_send_error_response_fmt(struct spdk_jsonrpc_request *request,
return;
}
spdk_json_write_name(w, "error");
spdk_json_write_object_begin(w);
spdk_json_write_name(w, "code");
spdk_json_write_int32(w, error_code);
spdk_json_write_name(w, "message");
spdk_json_write_named_object_begin(w, "error");
spdk_json_write_named_int32(w, "code", error_code);
va_start(args, fmt);
spdk_json_write_string_fmt_v(w, fmt, args);
spdk_json_write_named_string_fmt_v(w, "message", fmt, args);
va_end(args);
spdk_json_write_object_end(w);