From d848418d9b5be018b248255519dce54bfdd226a6 Mon Sep 17 00:00:00 2001
From: Ziye Yang <ziye.yang@intel.com>
Date: Sun, 29 Mar 2020 20:30:47 +0800
Subject: [PATCH] pipe: Simplify the pipe code

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: I86bfa885215c36e69f2b9c7a12dc5eb32f2a1bcd
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1566
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 lib/util/pipe.c | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/lib/util/pipe.c b/lib/util/pipe.c
index 6f96e7ec3..1c640dd2e 100644
--- a/lib/util/pipe.c
+++ b/lib/util/pipe.c
@@ -79,11 +79,7 @@ spdk_pipe_writer_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
 
 		sz = spdk_min(requested_sz, pipe->sz - write);
 
-		if (sz == 0) {
-			iovs[0].iov_base = NULL;
-		} else {
-			iovs[0].iov_base = pipe->buf + write;
-		}
+		iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + write);
 		iovs[0].iov_len = sz;
 
 		requested_sz -= sz;
@@ -91,11 +87,7 @@ spdk_pipe_writer_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
 		if (requested_sz > 0) {
 			sz = spdk_min(requested_sz, read);
 
-			if (sz == 0) {
-				iovs[1].iov_base = NULL;
-			} else {
-				iovs[1].iov_base = pipe->buf;
-			}
+			iovs[1].iov_base = (sz == 0) ? NULL : pipe->buf;
 			iovs[1].iov_len = sz;
 		} else {
 			iovs[1].iov_base = NULL;
@@ -104,13 +96,8 @@ spdk_pipe_writer_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
 	} else {
 		sz = spdk_min(requested_sz, read - write - 1);
 
-		if (sz == 0) {
-			iovs[0].iov_base = NULL;
-		} else {
-			iovs[0].iov_base = pipe->buf + write;
-		}
+		iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + write);
 		iovs[0].iov_len = sz;
-
 		iovs[1].iov_base = NULL;
 		iovs[1].iov_len = 0;
 	}
@@ -194,35 +181,21 @@ spdk_pipe_reader_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
 	if (read <= write) {
 		sz = spdk_min(requested_sz, write - read);
 
-		if (sz == 0) {
-			iovs[0].iov_base = NULL;
-		} else {
-			iovs[0].iov_base = pipe->buf + read;
-		}
+		iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + read);
 		iovs[0].iov_len = sz;
-
 		iovs[1].iov_base = NULL;
 		iovs[1].iov_len = 0;
 	} else {
 		sz = spdk_min(requested_sz, pipe->sz - read);
 
-		if (sz == 0) {
-			iovs[0].iov_base = NULL;
-		} else {
-			iovs[0].iov_base = pipe->buf + read;
-		}
+		iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + read);
 		iovs[0].iov_len = sz;
 
 		requested_sz -= sz;
 
 		if (requested_sz > 0) {
 			sz = spdk_min(requested_sz, write);
-
-			if (sz == 0) {
-				iovs[1].iov_base = NULL;
-			} else {
-				iovs[1].iov_base = pipe->buf;
-			}
+			iovs[1].iov_base = (sz == 0) ? NULL : pipe->buf;
 			iovs[1].iov_len = sz;
 		} else {
 			iovs[1].iov_base = NULL;