[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/27] nbd: Refactor conversion to errno to silence c
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 21/27] nbd: Refactor conversion to errno to silence checkpatch |
Date: |
Mon, 31 Oct 2016 15:37:37 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd/client.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/nbd/client.c b/nbd/client.c
index b29963b..7bdce53 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
- [Qemu-devel] [PULL 09/27] nbd: Add qemu-nbd -D for human-readable description, (continued)
- [Qemu-devel] [PULL 09/27] nbd: Add qemu-nbd -D for human-readable description, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 07/27] exec.c: check memory backend file size with 'size' option, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 11/27] nbd: Rename NBDRequest to NBDRequestData, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 10/27] nbd: Treat flags vs. command type as separate fields, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 12/27] nbd: Rename NbdClientSession to NBDClientSession, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 14/27] nbd: Share common reply-sending code in server, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 13/27] nbd: Rename struct nbd_request and nbd_reply, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 15/27] nbd: Send message along with server NBD_REP_ERR errors, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 17/27] nbd: Let server know when client gives up negotiation, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 19/27] nbd: Less allocation during NBD_OPT_LIST, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 21/27] nbd: Refactor conversion to errno to silence checkpatch,
Paolo Bonzini <=
- [Qemu-devel] [PULL 18/27] nbd: Let client skip portions of server reply, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 20/27] nbd: Support shorter handshake, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 22/27] nbd: Improve server handling of shutdown requests, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 23/27] nbd: Implement NBD_CMD_WRITE_ZEROES on server, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 16/27] nbd: Share common option-sending code in client, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 24/27] nbd: Implement NBD_CMD_WRITE_ZEROES on client, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 25/27] qemu-char: do not forward events through the mux until QEMU has started, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 26/27] slirp: fix CharDriver breakage, Paolo Bonzini, 2016/10/31
- [Qemu-devel] [PULL 27/27] x86: add AVX512_4VNNIW and AVX512_4FMAPS features, Paolo Bonzini, 2016/10/31