leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools lib bpf: Fix compiler warning on CentOS 6

Browse Source 
CC       libbpf.o
  cc1: warnings being treated as errors
  libbpf.c: In function 'bpf_program__title':
  libbpf.c:1037: error: declaration of 'dup' shadows a global declaration
  /usr/include/unistd.h:528: error: shadowed declaration is here
  mv: cannot stat `./.libbpf.o.tmp': No such file or directory
  make[3]: *** [libbpf.o] Error 1
  make[2]: *** [libbpf-in.o] Error 2
  make[1]: *** [/linux/tools/lib/bpf/libbpf.a] Error 2
  make[1]: *** Waiting for unfinished jobs....

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1446549665-2342-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2015-11-03 20:21:05 +09:00 committed by Arnaldo Carvalho de Melo
parent 7a0119468c
commit 715f8db910
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lib/bpf/libbpf.c
View File

@ -1034,12 +1034,12 @@ int bpf_program__get_private(struct bpf_program *prog, void **ppriv)
return 0; return 0;
} }
const char *bpf_program__title(struct bpf_program *prog, bool dup) const char *bpf_program__title(struct bpf_program *prog, bool needs_copy)
{ {
const char *title; const char *title;
title = prog->section_name; title = prog->section_name;
if (dup) { if (needs_copy) {
title = strdup(title); title = strdup(title);
if (!title) { if (!title) {
pr_warning("failed to strdup program title\n"); pr_warning("failed to strdup program title\n");

2
tools/lib/bpf/libbpf.h
View File

@ -63,7 +63,7 @@ int bpf_program__set_private(struct bpf_program *prog, void *priv,
int bpf_program__get_private(struct bpf_program *prog, int bpf_program__get_private(struct bpf_program *prog,
void **ppriv); void **ppriv);
const char *bpf_program__title(struct bpf_program *prog, bool dup); const char *bpf_program__title(struct bpf_program *prog, bool needs_copy);
int bpf_program__fd(struct bpf_program *prog); int bpf_program__fd(struct bpf_program *prog);