Commit be80e9cd authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Rename DECLARE_LIBBPF_OPTS into LIBBPF_OPTS 



It's confusing that libbpf-provided helper macro doesn't start with
LIBBPF. Also "declare" vs "define" is confusing terminology, I can never
remember and always have to look up previous examples.

Bypass both issues by renaming DECLARE_LIBBPF_OPTS into a short and
clean LIBBPF_OPTS. To avoid breaking existing code, provide:

  #define DECLARE_LIBBPF_OPTS LIBBPF_OPTS

in libbpf_legacy.h. We can decide later if we ever want to remove it or
we'll keep it forever because it doesn't add any maintainability burden.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDave Marchevsky <davemarchevsky@fb.com>
Link: https://lore.kernel.org/bpf/20211103220845.2676888-2-andrii@kernel.org
parent b8b5cb55

tools/lib/bpf/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <stdint.h>



#include "libbpf_common.h"

#include "libbpf_legacy.h"



#ifdef __cplusplus

extern "C" {

tools/lib/bpf/libbpf_common.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 * including any extra padding, it with memset() and then assigns initial

 * values provided by users in struct initializer-syntax as varargs.

 */

#define DECLARE_LIBBPF_OPTS(TYPE, NAME, ...)				    \

#define LIBBPF_OPTS(TYPE, NAME, ...)					    \

	struct TYPE NAME = ({ 						    \

		memset(&NAME, 0, sizeof(struct TYPE));			    \

		(struct TYPE) {						    \

tools/lib/bpf/libbpf_legacy.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ enum libbpf_strict_mode { 


LIBBPF_API int libbpf_set_strict_mode(enum libbpf_strict_mode mode);



#define DECLARE_LIBBPF_OPTS LIBBPF_OPTS



#ifdef __cplusplus

} /* extern "C" */