From 2be178a475289286db80de5ddd7830e67e112bdd Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Sat, 14 Sep 2013 13:11:36 +0400 Subject: iov: avoid "orig_len may be used unitialized" warning Signed-off-by: Wenchao Xia Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- util/iov.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'util') diff --git a/util/iov.c b/util/iov.c index f705586808..bb46c04e4d 100644 --- a/util/iov.c +++ b/util/iov.c @@ -181,13 +181,11 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, assert(iov[niov].iov_len > tail); orig_len = iov[niov].iov_len; iov[niov++].iov_len = tail; - } - - ret = do_send_recv(sockfd, iov, niov, do_send); - - /* Undo the changes above before checking for errors */ - if (tail) { + ret = do_send_recv(sockfd, iov, niov, do_send); + /* Undo the changes above before checking for errors */ iov[niov-1].iov_len = orig_len; + } else { + ret = do_send_recv(sockfd, iov, niov, do_send); } if (offset) { iov[0].iov_base -= offset; -- cgit v1.2.1