From 4c26a8e79f1af34b987f191e496b62be498a66c9 Mon Sep 17 00:00:00 2001 From: yidong0635 Date: Mon, 8 Feb 2021 09:51:42 +0800 Subject: [PATCH] lib/sock: Check conditions together. This avoids duplicated codes as other coding style. Signed-off-by: yidong0635 Change-Id: I111bd70d02cf23d38e6e73a4d0249adbfe8f24d4 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6314 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Tomasz Zawadzki Community-CI: Mellanox Build Bot --- lib/sock/sock.c | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/lib/sock/sock.c b/lib/sock/sock.c index c9d0d3bca..365d52ca1 100644 --- a/lib/sock/sock.c +++ b/lib/sock/sock.c @@ -380,12 +380,7 @@ spdk_sock_close(struct spdk_sock **_sock) ssize_t spdk_sock_recv(struct spdk_sock *sock, void *buf, size_t len) { - if (sock == NULL) { - errno = EBADF; - return -1; - } - - if (sock->flags.closed) { + if (sock == NULL || sock->flags.closed) { errno = EBADF; return -1; } @@ -396,12 +391,7 @@ spdk_sock_recv(struct spdk_sock *sock, void *buf, size_t len) ssize_t spdk_sock_readv(struct spdk_sock *sock, struct iovec *iov, int iovcnt) { - if (sock == NULL) { - errno = EBADF; - return -1; - } - - if (sock->flags.closed) { + if (sock == NULL || sock->flags.closed) { errno = EBADF; return -1; } @@ -412,12 +402,7 @@ spdk_sock_readv(struct spdk_sock *sock, struct iovec *iov, int iovcnt) ssize_t spdk_sock_writev(struct spdk_sock *sock, struct iovec *iov, int iovcnt) { - if (sock == NULL) { - errno = EBADF; - return -1; - } - - if (sock->flags.closed) { + if (sock == NULL || sock->flags.closed) { errno = EBADF; return -1; } @@ -430,12 +415,7 @@ spdk_sock_writev_async(struct spdk_sock *sock, struct spdk_sock_request *req) { assert(req->cb_fn != NULL); - if (sock == NULL) { - req->cb_fn(req->cb_arg, -EBADF); - return; - } - - if (sock->flags.closed) { + if (sock == NULL || sock->flags.closed) { req->cb_fn(req->cb_arg, -EBADF); return; } @@ -446,11 +426,7 @@ spdk_sock_writev_async(struct spdk_sock *sock, struct spdk_sock_request *req) int spdk_sock_flush(struct spdk_sock *sock) { - if (sock == NULL) { - return -EBADF; - } - - if (sock->flags.closed) { + if (sock == NULL || sock->flags.closed) { return -EBADF; }