| Message ID | 20200819025324.14680-1-vulab@iscas.ac.cn |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] libbpf: simplify the return expression of build_map_pin_path() | expand |
On 8/18/20 7:53 PM, Xu Wang wrote: > Simplify the return expression. > > Signed-off-by: Xu Wang <vulab@iscas.ac.cn> Acked-by: Yonghong Song <yhs@fb.com>
On 8/19/20 4:53 AM, Xu Wang wrote: > Simplify the return expression. > > Signed-off-by: Xu Wang <vulab@iscas.ac.cn> Applied, thanks!
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 5d20b2da4427..cd59e237ca96 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1924,7 +1924,7 @@ static bool get_map_field_int(const char *map_name, const struct btf *btf, static int build_map_pin_path(struct bpf_map *map, const char *path) { char buf[PATH_MAX]; - int err, len; + int len; if (!path) path = "/sys/fs/bpf"; @@ -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); }
Simplify the return expression. Signed-off-by: Xu Wang <vulab@iscas.ac.cn> --- tools/lib/bpf/libbpf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)