[PATCH bpf-next] bpftool: Don't try to return value from void function in skeleton

[PATCH bpf-next] bpftool: Don't try to return value from void function in skeleton

[Jörn-Thorben Hinz]

A skeleton generated by bpftool previously contained a return followed
by an expression in OBJ_NAME__detach(), which has return type void. This
did not hurt, the bpf_object__detach_skeleton() called there returns
void itself anyway, but led to a warning when compiling with e.g.
-pedantic.

Signed-off-by: Jörn-Thorben Hinz <jthinz@mailbox.tu-berlin.de>
---
 tools/bpf/bpftool/gen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c
index 1cf53bb01936..7070dcffa822 100644
--- a/tools/bpf/bpftool/gen.c
+++ b/tools/bpf/bpftool/gen.c
@@ -1175,7 +1175,7 @@ static int do_skeleton(int argc, char **argv)
 		static inline void					    \n\
 		%1$s__detach(struct %1$s *obj)				    \n\
 		{							    \n\
-			return bpf_object__detach_skeleton(obj->skeleton);  \n\
+			bpf_object__detach_skeleton(obj->skeleton);	    \n\
 		}							    \n\
 		",
 		obj_name
-- 
2.30.2

Re: [PATCH bpf-next] bpftool: Don't try to return value from void function in skeleton

[Quentin Monnet]

On Tue, 26 Jul 2022 at 14:32, Jörn-Thorben Hinz
<jthinz@mailbox.tu-berlin.de> wrote:
>
> A skeleton generated by bpftool previously contained a return followed
> by an expression in OBJ_NAME__detach(), which has return type void. This
> did not hurt, the bpf_object__detach_skeleton() called there returns
> void itself anyway, but led to a warning when compiling with e.g.
> -pedantic.
>
> Signed-off-by: Jörn-Thorben Hinz <jthinz@mailbox.tu-berlin.de>

Reviewed-by: Quentin Monnet <quentin@isovalent.com>

Thank you!

Re: [PATCH bpf-next] bpftool: Don't try to return value from void function in skeleton

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Tue, 26 Jul 2022 15:32:03 +0200 you wrote:
> A skeleton generated by bpftool previously contained a return followed
> by an expression in OBJ_NAME__detach(), which has return type void. This
> did not hurt, the bpf_object__detach_skeleton() called there returns
> void itself anyway, but led to a warning when compiling with e.g.
> -pedantic.
> 
> Signed-off-by: Jörn-Thorben Hinz <jthinz@mailbox.tu-berlin.de>
> 
> [...]

Here is the summary with links:
  - [bpf-next] bpftool: Don't try to return value from void function in skeleton
    https://git.kernel.org/bpf/bpf-next/c/a6df06744b2d

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