From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bv7Ia-0002VU-De for qemu-devel@nongnu.org; Fri, 14 Oct 2016 14:33:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bv7IZ-0001ez-AI for qemu-devel@nongnu.org; Fri, 14 Oct 2016 14:33:40 -0400 From: Eric Blake Date: Fri, 14 Oct 2016 13:33:15 -0500 Message-Id: <1476469998-28592-14-git-send-email-eblake@redhat.com> In-Reply-To: <1476469998-28592-1-git-send-email-eblake@redhat.com> References: <1476469998-28592-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v7 13/16] nbd: Refactor conversion to errno to silence checkpatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, pbonzini@redhat.com, mreitz@redhat.com Checkpatch complains that 'return EINVAL' is usually wrong (since we tend to favor 'return -EINVAL'). But it is a false positive for nbd_errno_to_system_errno(). Since NBD may add future defined wire values, refactor the code to keep checkpatch happy. Signed-off-by: Eric Blake --- v7: new patch --- nbd/client.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index f5e4c74..c6da4c4 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -23,23 +23,31 @@ static int nbd_errno_to_system_errno(int err) { + int ret; switch (err) { case NBD_SUCCESS: - return 0; + ret = 0; + break; case NBD_EPERM: - return EPERM; + ret = EPERM; + break; case NBD_EIO: - return EIO; + ret = EIO; + break; case NBD_ENOMEM: - return ENOMEM; + ret = ENOMEM; + break; case NBD_ENOSPC: - return ENOSPC; + ret = ENOSPC; + break; default: TRACE("Squashing unexpected error %d to EINVAL", err); /* fallthrough */ case NBD_EINVAL: - return EINVAL; + ret = EINVAL; + break; } + return ret; } /* Definitions for opaque data types */ -- 2.7.4