Commit 307ef667 authored by Ian Rogers's avatar Ian Rogers Committed by Andrii Nakryiko
Browse files

libbpf: Add namespace for errstr making it libbpf_errstr 



When statically linking symbols can be replaced with those from other
statically linked libraries depending on the link order and the hoped
for "multiple definition" error may not appear. To avoid conflicts it
is good practice to namespace symbols, this change renames errstr to
libbpf_errstr. To avoid churn a #define is used to turn use of
errstr(err) to libbpf_errstr(err).

Fixes: 1633a83b ("libbpf: Introduce errstr() for stringifying errno")
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20250320222439.1350187-1-irogers@google.com
parent 51d65049

tools/lib/bpf/str_error.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ char *libbpf_strerror_r(int err, char *dst, int len) 
	return dst;

}



const char *errstr(int err)

const char *libbpf_errstr(int err)

{

	static __thread char buf[12];

tools/lib/bpf/str_error.h

+5 −2
Original line number Diff line number Diff line
@@ -7,10 +7,13 @@ 
char *libbpf_strerror_r(int err, char *dst, int len);



/**

 * @brief **errstr()** returns string corresponding to numeric errno

 * @brief **libbpf_errstr()** returns string corresponding to numeric errno

 * @param err negative numeric errno

 * @return pointer to string representation of the errno, that is invalidated

 * upon the next call.

 */

const char *errstr(int err);

const char *libbpf_errstr(int err);



#define errstr(err) libbpf_errstr(err)



#endif /* __LIBBPF_STR_ERROR_H */