2023-09-04 09:56:18

by kunyu

Subject: [PATCH] ceph/decode: Remove unnecessary ‘0’ values from ret

ret is assigned first, so it does not need to initialize the
assignment.
Bad is not used and can be removed.

Signed-off-by: Li kunyu <[email protected]>
---
net/ceph/decode.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/ceph/decode.c b/net/ceph/decode.c
index bc109a1a4616..9f5f095d8235 100644
--- a/net/ceph/decode.c
+++ b/net/ceph/decode.c
@@ -50,7 +50,7 @@ static int
ceph_decode_entity_addr_legacy(void **p, void *end,
struct ceph_entity_addr *addr)
{
- int ret = -EINVAL;
+ int ret = 0;

/* Skip rest of type field */
ceph_decode_skip_n(p, end, 3, bad);
@@ -66,8 +66,7 @@ ceph_decode_entity_addr_legacy(void **p, void *end,
sizeof(addr->in_addr), bad);
addr->in_addr.ss_family =
be16_to_cpu((__force __be16)addr->in_addr.ss_family);
- ret = 0;
-bad:
+
return ret;
}

--
2.18.2

2023-09-05 16:24:55

by Xiubo Li

Subject: Re: [PATCH] ceph/decode: Remove unnecessary ‘0’ values from ret

On 9/3/23 04:11, Li kunyu wrote:
> ret is assigned first, so it does not need to initialize the
> assignment.
> Bad is not used and can be removed.
>
> Signed-off-by: Li kunyu <[email protected]>
> ---
> net/ceph/decode.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/net/ceph/decode.c b/net/ceph/decode.c
> index bc109a1a4616..9f5f095d8235 100644
> --- a/net/ceph/decode.c
> +++ b/net/ceph/decode.c
> @@ -50,7 +50,7 @@ static int
> ceph_decode_entity_addr_legacy(void **p, void *end,
> struct ceph_entity_addr *addr)
> {
> - int ret = -EINVAL;
> + int ret = 0;
>
> /* Skip rest of type field */
> ceph_decode_skip_n(p, end, 3, bad);

Hi Kunyu,

The 'bad' lable is used here in this macro.

Thanks

- Xiubo

> @@ -66,8 +66,7 @@ ceph_decode_entity_addr_legacy(void **p, void *end,
> sizeof(addr->in_addr), bad);
> addr->in_addr.ss_family =
> be16_to_cpu((__force __be16)addr->in_addr.ss_family);
> - ret = 0;
> -bad:
> +
> return ret;
> }
>