Thread (5 messages) 5 messages, 5 authors, 2017-03-30

Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value

From: Jorgen S. Hansen <hidden>
Date: 2017-03-30 13:18:18
Also in: kernel-janitors, lkml

quoted hunk ↗ jump to hunk
On Mar 29, 2017, at 5:33 PM, Colin King [off-list ref] wrote:

From: Colin Ian King <redacted>

Rather than assign the positive errno values to ret and then
checking if it is positive and flip the sign, just return the
errno value.

Detected by CoverityScan, CID#986649 ("Logically Dead Code")

Signed-off-by: Colin Ian King <redacted>
---
net/vmw_vsock/vmci_transport.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 4be4fbbc0b50..10ae7823a19d 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -96,31 +96,23 @@ static int PROTOCOL_OVERRIDE = -1;
static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
{
-	int err;
-
	switch (vmci_error) {
	case VMCI_ERROR_NO_MEM:
-		err = ENOMEM;
-		break;
+		return -ENOMEM;
	case VMCI_ERROR_DUPLICATE_ENTRY:
	case VMCI_ERROR_ALREADY_EXISTS:
-		err = EADDRINUSE;
-		break;
+		return -EADDRINUSE;
	case VMCI_ERROR_NO_ACCESS:
-		err = EPERM;
-		break;
+		return -EPERM;
	case VMCI_ERROR_NO_RESOURCES:
-		err = ENOBUFS;
-		break;
+		return -ENOBUFS;
	case VMCI_ERROR_INVALID_RESOURCE:
-		err = EHOSTUNREACH;
-		break;
+		return -EHOSTUNREACH;
	case VMCI_ERROR_INVALID_ARGS:
	default:
-		err = EINVAL;
+		break;
	}
-
-	return err > 0 ? -err : err;
+	return -EINVAL;
}

static u32 vmci_transport_peer_rid(u32 peer_cid)
-- 
2.11.0
Reviewed-by: Jorgen Hansen <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help