Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1611137 > unrolled thread
| Started by | Colin King <colin.king@canonical.com> |
|---|---|
| First post | 2017-03-28 18:00 +0200 |
| Last post | 2017-03-29 07:00 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] VSOCK: remove unnecessary ternary operator on return value Colin King <colin.king@canonical.com> - 2017-03-28 18:00 +0200
Re: [PATCH] VSOCK: remove unnecessary ternary operator on return value walter harms <wharms@bfs.de> - 2017-03-28 18:10 +0200
Re: [PATCH] VSOCK: remove unnecessary ternary operator on return value David Miller <davem@davemloft.net> - 2017-03-29 07:00 +0200
| From | Colin King <colin.king@canonical.com> |
|---|---|
| Date | 2017-03-28 18:00 +0200 |
| Subject | [PATCH] VSOCK: remove unnecessary ternary operator on return value |
| Message-ID | <tq1Hk-1nl-33@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | walter harms <wharms@bfs.de> |
|---|---|
| Date | 2017-03-28 18:10 +0200 |
| Subject | Re: [PATCH] VSOCK: remove unnecessary ternary operator on return value |
| Message-ID | <tq1R1-1HW-43@gated-at.bofh.it> |
| In reply to | #1611137 |
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
[toc] | [prev] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-03-29 07:00 +0200 |
| Subject | Re: [PATCH] VSOCK: remove unnecessary ternary operator on return value |
| Message-ID | <tqdS9-1Qy-13@gated-at.bofh.it> |
| In reply to | #1611137 |
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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web