From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754812AbbKCPNZ (ORCPT ); Tue, 3 Nov 2015 10:13:25 -0500 Received: from mail.kernel.org ([198.145.29.136]:37432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753308AbbKCPNX (ORCPT ); Tue, 3 Nov 2015 10:13:23 -0500 Date: Tue, 3 Nov 2015 12:13:18 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Wang Nan Subject: Re: [PATCH] tools/lib/bpf: Fix compiler warning on CentOS 6 Message-ID: <20151103151318.GN21609@kernel.org> References: <1446549665-2342-1-git-send-email-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1446549665-2342-1-git-send-email-namhyung@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Tue, Nov 03, 2015 at 08:21:05PM +0900, Namhyung Kim escreveu: > 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.... Thanks, applied. - Arnaldo > Cc: Wang Nan > Signed-off-by: Namhyung Kim > --- > tools/lib/bpf/libbpf.c | 4 ++-- > tools/lib/bpf/libbpf.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > index 4252fc22f78f..9f3c8cf9249b 100644 > --- a/tools/lib/bpf/libbpf.c > +++ b/tools/lib/bpf/libbpf.c > @@ -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"); > diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h > index f16170c95ffd..bc80af03c6f4 100644 > --- a/tools/lib/bpf/libbpf.h > +++ b/tools/lib/bpf/libbpf.h > @@ -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); > > -- > 2.6.2