Commit 715f8db9 authored Nov 03, 2015 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Nov 03, 2015

tools lib bpf: Fix compiler warning on CentOS 6



    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>

parent 7a011946

tools/lib/bpf/libbpf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1034,12 +1034,12 @@ int bpf_program__get_private(struct bpf_program prog, void *ppriv)
		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;

		title = prog->section_name;
		if (dup) {
		if (needs_copy) {
		title = strdup(title);
		if (!title) {
		pr_warning("failed to strdup program title\n");

tools/lib/bpf/libbpf.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ int bpf_program__set_private(struct bpf_program prog, void priv,
		int bpf_program__get_private(struct bpf_program *prog,
		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);

Admin message