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

lib/sock: Check conditions together.

Browse Source 
This avoids duplicated codes as other coding style.

Signed-off-by: yidong0635 <dongx.yi@intel.com>
Change-Id: I111bd70d02cf23d38e6e73a4d0249adbfe8f24d4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6314
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
yidong0635 2021-02-08 09:51:42 +08:00 committed by Tomasz Zawadzki
parent 0859c83790
commit 4c26a8e79f
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/sock/sock.c
View File

@ -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;
}