diff --git a/lib/log/rpc/log_rpc.c b/lib/log/rpc/log_rpc.c index 1a38dd362..a395b3cd0 100644 --- a/lib/log/rpc/log_rpc.c +++ b/lib/log/rpc/log_rpc.c @@ -81,6 +81,23 @@ _parse_log_level(char *level) return -1; } +static const char * +_get_log_level_name(int level) +{ + if (level == SPDK_LOG_ERROR) { + return "ERROR"; + } else if (level == SPDK_LOG_WARN) { + return "WARNING"; + } else if (level == SPDK_LOG_NOTICE) { + return "NOTICE"; + } else if (level == SPDK_LOG_INFO) { + return "INFO"; + } else if (level == SPDK_LOG_DEBUG) { + return "DEBUG"; + } + return NULL; +} + static void spdk_rpc_set_log_print_level(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) @@ -125,6 +142,7 @@ spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, { struct spdk_json_write_ctx *w; int level; + const char *name; if (params != NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, @@ -138,17 +156,9 @@ spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, } level = spdk_log_get_print_level(); + name = _get_log_level_name(level); + spdk_json_write_string(w, name); - if (level == SPDK_LOG_ERROR) - spdk_json_write_string(w, "ERROR"); - if (level == SPDK_LOG_WARN) - spdk_json_write_string(w, "WARNING"); - if (level == SPDK_LOG_NOTICE) - spdk_json_write_string(w, "NOTICE"); - if (level == SPDK_LOG_INFO) - spdk_json_write_string(w, "INFO"); - if (level == SPDK_LOG_DEBUG) - spdk_json_write_string(w, "DEBUG"); spdk_jsonrpc_end_result(request, w); } @@ -199,6 +209,7 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, { struct spdk_json_write_ctx *w; int level; + const char *name; if (params != NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, @@ -212,17 +223,8 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, } level = spdk_log_get_level(); - - if (level == SPDK_LOG_ERROR) - spdk_json_write_string(w, "ERROR"); - if (level == SPDK_LOG_WARN) - spdk_json_write_string(w, "WARNING"); - if (level == SPDK_LOG_NOTICE) - spdk_json_write_string(w, "NOTICE"); - if (level == SPDK_LOG_INFO) - spdk_json_write_string(w, "INFO"); - if (level == SPDK_LOG_DEBUG) - spdk_json_write_string(w, "DEBUG"); + name = _get_log_level_name(level); + spdk_json_write_string(w, name); spdk_jsonrpc_end_result(request, w); }