2022-02-23 10:18:04

by Yuntao Wang

Subject: [PATCH bpf-next] libbpf: Simplify the find_elf_sec_sz() function

The check in the last return statement is unnecessary, we can just return
the ret variable.

But we can simplify the function further by returning 0 immediately if we
find the section size and -ENOENT otherwise.

Thus we can also remove the ret variable.

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

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 7e978feaf822..776b8e034d62 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1374,22 +1374,20 @@ static bool bpf_map_type__is_map_in_map(enum bpf_map_type type)

static int find_elf_sec_sz(const struct bpf_object *obj, const char *name, __u32 *size)
{
- int ret = -ENOENT;
Elf_Data *data;
Elf_Scn *scn;

- *size = 0;
if (!name)
return -EINVAL;

scn = elf_sec_by_name(obj, name);
data = elf_sec_data(obj, scn);
if (data) {
- ret = 0; /* found it */
*size = data->d_size;
+ return 0; /* found it */
}

- return *size ? 0 : ret;
+ return -ENOENT;
}

static int find_elf_var_offset(const struct bpf_object *obj, const char *name, __u32 *off)
--
2.35.0.rc2

2022-02-24 01:20:54

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf-next] libbpf: Simplify the find_elf_sec_sz() function

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <[email protected]>:

On Wed, 23 Feb 2022 16:52:44 +0800 you wrote:
> The check in the last return statement is unnecessary, we can just return
> the ret variable.
>
> But we can simplify the function further by returning 0 immediately if we
> find the section size and -ENOENT otherwise.
>
> Thus we can also remove the ret variable.
>
> [...]

Here is the summary with links:
- [bpf-next] libbpf: Simplify the find_elf_sec_sz() function
https://git.kernel.org/bpf/bpf-next/c/08894d9c647a

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html