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

libbpf: move libbpf_errstr() into libbpf_utils.c 



Get rid of str_err.{c,h} by moving implementation of libbpf_errstr()
into libbpf_utils.c and declarations into libbpf_internal.h.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20251001171326.3883055-4-andrii@kernel.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
parent d05ab618

tools/lib/bpf/Build

+1 −1
Original line number Diff line number Diff line 
libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_utils.o str_error.o \

libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_utils.o \

	    netlink.o bpf_prog_linfo.o libbpf_probes.o hashmap.o \

	    btf_dump.o ringbuf.o strset.o linker.o gen_loader.o relo_core.o \

	    usdt.o zip.o elf.o features.o btf_iter.o btf_relocate.o

tools/lib/bpf/btf.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "libbpf_internal.h"

#include "hashmap.h"

#include "strset.h"

#include "str_error.h"



#define BTF_MAX_NR_TYPES 0x7fffffffU

#define BTF_MAX_STR_OFFSET 0x7fffffffU

tools/lib/bpf/btf_dump.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "hashmap.h"

#include "libbpf.h"

#include "libbpf_internal.h"

#include "str_error.h"



static const char PREFIXES[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t";

static const size_t PREFIX_CNT = sizeof(PREFIXES) - 1;

tools/lib/bpf/elf.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/kernel.h>



#include "libbpf_internal.h"

#include "str_error.h"



/* A SHT_GNU_versym section holds 16-bit words. This bit is set if

 * the symbol is hidden and can only be seen when referenced using an

tools/lib/bpf/features.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include "libbpf.h"

#include "libbpf_common.h"

#include "libbpf_internal.h"

#include "str_error.h"



static inline __u64 ptr_to_u64(const void *ptr)

{