b42699547f
During porting libbpf to bcc, I got some warnings like below:
...
[ 2%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/libbpf.c.o
/home/yhs/work/bcc2/src/cc/libbpf/src/libbpf.c:12:0:
warning: "_GNU_SOURCE" redefined [enabled by default]
#define _GNU_SOURCE
...
[ 3%] Building C object src/cc/CMakeFiles/bpf-shared.dir/libbpf/src/libbpf_errno.c.o
/home/yhs/work/bcc2/src/cc/libbpf/src/libbpf_errno.c: In function ‘libbpf_strerror’:
/home/yhs/work/bcc2/src/cc/libbpf/src/libbpf_errno.c:45:7:
warning: assignment makes integer from pointer without a cast [enabled by default]
ret = strerror_r(err, buf, size);
...
bcc is built with _GNU_SOURCE defined and this caused the above warning.
This patch intends to make libpf _GNU_SOURCE friendly by
. define _GNU_SOURCE in libbpf.c unless it is not defined
. undefine _GNU_SOURCE as non-gnu version of strerror_r is expected.
Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
64 lines
1.8 KiB
C
64 lines
1.8 KiB
C
// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
|
|
|
|
/*
|
|
* Copyright (C) 2013-2015 Alexei Starovoitov <ast@kernel.org>
|
|
* Copyright (C) 2015 Wang Nan <wangnan0@huawei.com>
|
|
* Copyright (C) 2015 Huawei Inc.
|
|
* Copyright (C) 2017 Nicira, Inc.
|
|
*/
|
|
|
|
#undef _GNU_SOURCE
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "libbpf.h"
|
|
|
|
#define ERRNO_OFFSET(e) ((e) - __LIBBPF_ERRNO__START)
|
|
#define ERRCODE_OFFSET(c) ERRNO_OFFSET(LIBBPF_ERRNO__##c)
|
|
#define NR_ERRNO (__LIBBPF_ERRNO__END - __LIBBPF_ERRNO__START)
|
|
|
|
static const char *libbpf_strerror_table[NR_ERRNO] = {
|
|
[ERRCODE_OFFSET(LIBELF)] = "Something wrong in libelf",
|
|
[ERRCODE_OFFSET(FORMAT)] = "BPF object format invalid",
|
|
[ERRCODE_OFFSET(KVERSION)] = "'version' section incorrect or lost",
|
|
[ERRCODE_OFFSET(ENDIAN)] = "Endian mismatch",
|
|
[ERRCODE_OFFSET(INTERNAL)] = "Internal error in libbpf",
|
|
[ERRCODE_OFFSET(RELOC)] = "Relocation failed",
|
|
[ERRCODE_OFFSET(VERIFY)] = "Kernel verifier blocks program loading",
|
|
[ERRCODE_OFFSET(PROG2BIG)] = "Program too big",
|
|
[ERRCODE_OFFSET(KVER)] = "Incorrect kernel version",
|
|
[ERRCODE_OFFSET(PROGTYPE)] = "Kernel doesn't support this program type",
|
|
[ERRCODE_OFFSET(WRNGPID)] = "Wrong pid in netlink message",
|
|
[ERRCODE_OFFSET(INVSEQ)] = "Invalid netlink sequence",
|
|
[ERRCODE_OFFSET(NLPARSE)] = "Incorrect netlink message parsing",
|
|
};
|
|
|
|
int libbpf_strerror(int err, char *buf, size_t size)
|
|
{
|
|
if (!buf || !size)
|
|
return -1;
|
|
|
|
err = err > 0 ? err : -err;
|
|
|
|
if (err < __LIBBPF_ERRNO__START) {
|
|
int ret;
|
|
|
|
ret = strerror_r(err, buf, size);
|
|
buf[size - 1] = '\0';
|
|
return ret;
|
|
}
|
|
|
|
if (err < __LIBBPF_ERRNO__END) {
|
|
const char *msg;
|
|
|
|
msg = libbpf_strerror_table[ERRNO_OFFSET(err)];
|
|
snprintf(buf, size, "%s", msg);
|
|
buf[size - 1] = '\0';
|
|
return 0;
|
|
}
|
|
|
|
snprintf(buf, size, "Unknown libbpf error %d", err);
|
|
buf[size - 1] = '\0';
|
|
return -1;
|
|
}
|