From 1482fdea3edf55af2a6e5d5f545ac42e0565fdc7 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sat, 9 May 2020 16:14:30 -0700 Subject: [PATCH] lib/rpc: remove spdk prefix from static functions in rpc.c Signed-off-by: Seth Howell Change-Id: I60a84c48b2768a2f93a859f78c961294dd590461 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2294 Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Reviewed-by: Darek Stojaczyk Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- lib/rpc/rpc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/rpc/rpc.c b/lib/rpc/rpc.c index 5b3c55525..cd32ebba1 100644 --- a/lib/rpc/rpc.c +++ b/lib/rpc/rpc.c @@ -104,9 +104,9 @@ _get_rpc_method_raw(const char *method) } static void -spdk_jsonrpc_handler(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *method, - const struct spdk_json_val *params) +jsonrpc_handler(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *method, + const struct spdk_json_val *params) { struct spdk_rpc_method *m; @@ -193,7 +193,7 @@ spdk_rpc_listen(const char *listen_addr) g_jsonrpc_server = spdk_jsonrpc_server_listen(AF_UNIX, 0, (struct sockaddr *)&g_rpc_listen_addr_unix, sizeof(g_rpc_listen_addr_unix), - spdk_jsonrpc_handler); + jsonrpc_handler); if (g_jsonrpc_server == NULL) { close(g_rpc_lock_fd); g_rpc_lock_fd = -1; @@ -233,7 +233,7 @@ spdk_rpc_listen(const char *listen_addr) g_jsonrpc_server = spdk_jsonrpc_server_listen(res->ai_family, res->ai_protocol, res->ai_addr, res->ai_addrlen, - spdk_jsonrpc_handler); + jsonrpc_handler); freeaddrinfo(res); free(tmp); @@ -373,7 +373,7 @@ static const struct spdk_json_object_decoder rpc_get_methods_decoders[] = { }; static void -spdk_rpc_get_methods(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) +rpc_get_methods(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_get_methods req = {}; struct spdk_json_write_ctx *w; @@ -403,11 +403,11 @@ spdk_rpc_get_methods(struct spdk_jsonrpc_request *request, const struct spdk_jso spdk_json_write_array_end(w); spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("rpc_get_methods", spdk_rpc_get_methods, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("rpc_get_methods", rpc_get_methods, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(rpc_get_methods, get_rpc_methods) static void -spdk_rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) +rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_json_write_ctx *w; @@ -434,6 +434,6 @@ spdk_rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spd spdk_json_write_object_end(w); spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("spdk_get_version", spdk_rpc_spdk_get_version, +SPDK_RPC_REGISTER("spdk_get_version", rpc_spdk_get_version, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(spdk_get_version, get_spdk_version)