2020-08-18 08:21:23

by Xu Wang

Subject: [PATCH] libbpf: simplify the return expression of build_map_pin_path()

Simplify the return expression.

Signed-off-by: Xu Wang <[email protected]>
---
tools/lib/bpf/libbpf.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 5055e1531e43..b423fdaae0b6 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1935,11 +1935,7 @@ static int build_map_pin_path(struct bpf_map *map, const char *path)
else if (len >= PATH_MAX)
return -ENAMETOOLONG;

- err = bpf_map__set_pin_path(map, buf);
- if (err)
- return err;
-
- return 0;
+ return bpf_map__set_pin_path(map, buf);
}


--
2.17.1

2020-08-18 15:52:35

by Yonghong Song

Subject: Re: [PATCH] libbpf: simplify the return expression of build_map_pin_path()

On 8/18/20 1:20 AM, Xu Wang wrote:
> Simplify the return expression.
>
> Signed-off-by: Xu Wang <[email protected]>
> ---
> tools/lib/bpf/libbpf.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 5055e1531e43..b423fdaae0b6 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -1935,11 +1935,7 @@ static int build_map_pin_path(struct bpf_map *map, const char *path)
> else if (len >= PATH_MAX)
> return -ENAMETOOLONG;
>
> - err = bpf_map__set_pin_path(map, buf);
> - if (err)
> - return err;
> -
> - return 0;
> + return bpf_map__set_pin_path(map, buf);

After the above, the variable `err` will not be used any more, which
may incur an unused variable warning. Could you remove it?

> }
>
>
>

2020-08-18 15:56:06

by Yonghong Song

Subject: Re: [PATCH] libbpf: simplify the return expression of build_map_pin_path()

On 8/18/20 1:20 AM, Xu Wang wrote:
> Simplify the return expression.
>
> Signed-off-by: Xu Wang <[email protected]>

Also, please tag your patch targeting to 'bpf-next' tree like
[PATCH bpf-next] so people knows which tree the patch targets.

> ---
> tools/lib/bpf/libbpf.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 5055e1531e43..b423fdaae0b6 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -1935,11 +1935,7 @@ static int build_map_pin_path(struct bpf_map *map, const char *path)
> else if (len >= PATH_MAX)
> return -ENAMETOOLONG;
>
> - err = bpf_map__set_pin_path(map, buf);
> - if (err)
> - return err;
> -
> - return 0;
> + return bpf_map__set_pin_path(map, buf);
> }
>
>
>