Commit 3d23defb authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Ben Walker
Browse files

Remove remaining spdk_jsonrpc_begin_result() NULL checks 



After recent changes, that function can not return
NULL anymore, so remove all redundant checks from
various SPDK libraries.

Change-Id: If80344b6fa81ad5f87a7086804dba221522cd7e2
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464175


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 4a713238

lib/bdev/compress/vbdev_compress_rpc.c

+0 −9
Original line number Diff line number Diff line
@@ -131,11 +131,6 @@ spdk_rpc_construct_compress_bdev(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		free_rpc_construct_compress(&req);

		return;

	}



	name = spdk_sprintf_alloc("COMP_%s", req.base_bdev_name);

	spdk_json_write_string(w, name);

	spdk_jsonrpc_end_result(request, w);
@@ -167,10 +162,6 @@ _spdk_rpc_delete_compress_bdev_cb(void *cb_arg, int bdeverrno) 
	struct spdk_json_write_ctx *w;



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

}

lib/bdev/delay/vbdev_delay_rpc.c

+0 −8
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ spdk_rpc_bdev_delay_create(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		goto cleanup;

	}



	spdk_json_write_string(w, req.name);

	spdk_jsonrpc_end_result(request, w);
@@ -121,10 +117,6 @@ _spdk_rpc_bdev_delay_delete_cb(void *cb_arg, int bdeverrno) 
	struct spdk_json_write_ctx *w;



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

}

lib/event/rpc/app_rpc.c

+0 −4
Original line number Diff line number Diff line
@@ -202,10 +202,6 @@ spdk_rpc_thread_get_stats(struct spdk_jsonrpc_request *request, 
	ctx->request = request;



	ctx->w = spdk_jsonrpc_begin_result(ctx->request);

	if (NULL == ctx->w) {

		free(ctx);

		return;

	}

	spdk_json_write_object_begin(ctx->w);

	spdk_json_write_named_uint64(ctx->w, "tick_rate", spdk_get_ticks_hz());

	spdk_json_write_named_array_begin(ctx->w, "threads");

lib/event/rpc/notify_rpc.c

+0 −7
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ spdk_rpc_get_notification_types(struct spdk_jsonrpc_request *request, 
	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_array_begin(w);

	spdk_notify_foreach_type(get_notification_types_cb, w);

	spdk_json_write_array_end(w);
@@ -116,9 +112,6 @@ spdk_rpc_get_notifications(struct spdk_jsonrpc_request *request, 




	req.w = spdk_jsonrpc_begin_result(request);

	if (req.w == NULL) {

		return;

	}



	spdk_json_write_array_begin(req.w);

	spdk_notify_foreach_event(req.id, req.max, get_notifications_cb, &req);

lib/event/subsystems/vmd/vmd_rpc.c

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ spdk_rpc_vmd_enable(struct spdk_jsonrpc_request *request, const struct spdk_json 
	rc = spdk_vmd_init();



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, rc == 0);

	spdk_jsonrpc_end_result(request, w);

}