* [PATCH] VSOCK: remove unnecessary ternary operator on return value
@ 2017-03-28 15:54 Colin King
2017-03-28 16:04 ` walter harms
2017-03-29 4:49 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2017-03-28 15:54 UTC (permalink / raw)
To: David S . Miller, Jorgen Hansen, Adit Ranadive, Julia Lawall,
Stefan Hajnoczi, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Rather than assign the positive errno values to ret and then
checking if it is positive and flip the sign, just set ret to
be the -ve errno value.
Detected by CoverityScan, CID#986649 ("Logically Dead Code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
net/vmw_vsock/vmci_transport.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 4be4fbbc0b50..a68cd6b0fb72 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -100,27 +100,27 @@ static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
switch (vmci_error) {
case VMCI_ERROR_NO_MEM:
- err = ENOMEM;
+ err = -ENOMEM;
break;
case VMCI_ERROR_DUPLICATE_ENTRY:
case VMCI_ERROR_ALREADY_EXISTS:
- err = EADDRINUSE;
+ err = -EADDRINUSE;
break;
case VMCI_ERROR_NO_ACCESS:
- err = EPERM;
+ err = -EPERM;
break;
case VMCI_ERROR_NO_RESOURCES:
- err = ENOBUFS;
+ err = -ENOBUFS;
break;
case VMCI_ERROR_INVALID_RESOURCE:
- err = EHOSTUNREACH;
+ err = -EHOSTUNREACH;
break;
case VMCI_ERROR_INVALID_ARGS:
default:
- err = EINVAL;
+ err = -EINVAL;
}
- return err > 0 ? -err : err;
+ return err;
}
static u32 vmci_transport_peer_rid(u32 peer_cid)
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] VSOCK: remove unnecessary ternary operator on return value
2017-03-28 15:54 [PATCH] VSOCK: remove unnecessary ternary operator on return value Colin King
@ 2017-03-28 16:04 ` walter harms
2017-03-29 4:49 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: walter harms @ 2017-03-28 16:04 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, Jorgen Hansen, Adit Ranadive, Julia Lawall,
Stefan Hajnoczi, netdev, kernel-janitors, linux-kernel
Am 28.03.2017 17:54, schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>
>
> Rather than assign the positive errno values to ret and then
> checking if it is positive and flip the sign, just set ret to
> be the -ve errno value.
>
> Detected by CoverityScan, CID#986649 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> net/vmw_vsock/vmci_transport.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
> index 4be4fbbc0b50..a68cd6b0fb72 100644
> --- a/net/vmw_vsock/vmci_transport.c
> +++ b/net/vmw_vsock/vmci_transport.c
> @@ -100,27 +100,27 @@ static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
>
> switch (vmci_error) {
> case VMCI_ERROR_NO_MEM:
> - err = ENOMEM;
> + err = -ENOMEM;
> break;
> case VMCI_ERROR_DUPLICATE_ENTRY:
> case VMCI_ERROR_ALREADY_EXISTS:
> - err = EADDRINUSE;
> + err = -EADDRINUSE;
> break;
> case VMCI_ERROR_NO_ACCESS:
> - err = EPERM;
> + err = -EPERM;
> break;
> case VMCI_ERROR_NO_RESOURCES:
> - err = ENOBUFS;
> + err = -ENOBUFS;
> break;
> case VMCI_ERROR_INVALID_RESOURCE:
> - err = EHOSTUNREACH;
> + err = -EHOSTUNREACH;
> break;
> case VMCI_ERROR_INVALID_ARGS:
> default:
> - err = EINVAL;
> + err = -EINVAL;
> }
>
> - return err > 0 ? -err : err;
> + return err;
> }
>
> static u32 vmci_transport_peer_rid(u32 peer_cid)
yes, but because there is nothing to do you could return directly
and forget about err.
note: why is there a MCI_ERROR_NO_MEM when you can map this to ENOMEM ?
re,
wh
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] VSOCK: remove unnecessary ternary operator on return value
2017-03-28 15:54 [PATCH] VSOCK: remove unnecessary ternary operator on return value Colin King
2017-03-28 16:04 ` walter harms
@ 2017-03-29 4:49 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-03-29 4:49 UTC (permalink / raw)
To: colin.king
Cc: jhansen, aditr, julia.lawall, stefanha, netdev, kernel-janitors,
linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Tue, 28 Mar 2017 16:54:24 +0100
> From: Colin Ian King <colin.king@canonical.com>
>
> Rather than assign the positive errno values to ret and then
> checking if it is positive and flip the sign, just set ret to
> be the -ve errno value.
>
> Detected by CoverityScan, CID#986649 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Just return the error directly instead of having this variable.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-29 4:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-28 15:54 [PATCH] VSOCK: remove unnecessary ternary operator on return value Colin King
2017-03-28 16:04 ` walter harms
2017-03-29 4:49 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).