OSDN Git Service

libbpf: Make DECLARE_LIBBPF_OPTS macro strictly a variable declaration
authorAndrii Nakryiko <andriin@fb.com>
Tue, 22 Oct 2019 17:21:00 +0000 (10:21 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 22 Oct 2019 19:35:03 +0000 (21:35 +0200)
commite00aca65e646da08f8dce31c9b89f11dab76198c
tree2f9032dcc2fdb91c7875cf6991b691627d367060
parente13a2fe642bd4a42c2b468cdb25ad3aab933d572
libbpf: Make DECLARE_LIBBPF_OPTS macro strictly a variable declaration

LIBBPF_OPTS is implemented as a mix of field declaration and memset
+ assignment. This makes it neither variable declaration nor purely
statements, which is a problem, because you can't mix it with either
other variable declarations nor other function statements, because C90
compiler mode emits warning on mixing all that together.

This patch changes LIBBPF_OPTS into a strictly declaration of variable
and solves this problem, as can be seen in case of bpftool, which
previously would emit compiler warning, if done this way (LIBBPF_OPTS as
part of function variables declaration block).

This patch also renames LIBBPF_OPTS into DECLARE_LIBBPF_OPTS to follow
kernel convention for similar macros more closely.

v1->v2:
- rename LIBBPF_OPTS into DECLARE_LIBBPF_OPTS (Jakub Sitnicki).

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/bpf/20191022172100.3281465-1-andriin@fb.com
tools/bpf/bpftool/prog.c
tools/lib/bpf/libbpf.c
tools/lib/bpf/libbpf.h
tools/testing/selftests/bpf/prog_tests/attach_probe.c
tools/testing/selftests/bpf/prog_tests/core_reloc.c
tools/testing/selftests/bpf/prog_tests/reference_tracking.c