From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Marek Subject: Re: linux-next: build warning after merge of the kbuild tree Date: Thu, 30 Sep 2010 22:25:07 +0200 Message-ID: <20100930202507.GC25629@sepie.suse.cz> References: <20100930105025.c46e2fe0.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from cantor.suse.de ([195.135.220.2]:53948 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932188Ab0I3UZI (ORCPT ); Thu, 30 Sep 2010 16:25:08 -0400 Content-Disposition: inline In-Reply-To: <20100930105025.c46e2fe0.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arnaud Lacombe , Sam Ravnborg On Thu, Sep 30, 2010 at 10:50:25AM +1000, Stephen Rothwell wrote: > Hi Michal, > > After merging the kbuild tree, today's linux-next build (powerpc > ppc64_defconfig) produced this warning: > > scripts/kconfig/kxgettext.c: In function 'menu_build_message_list': > scripts/kconfig/kxgettext.c:175: warning: passing argument 3 of 'message__add' discards qualifiers from pointer target type > scripts/kconfig/kxgettext.c:148: note: expected 'char *' but argument is of type 'const char * const' > scripts/kconfig/kxgettext.c:180: warning: passing argument 3 of 'message__add' discards qualifiers from pointer target type > scripts/kconfig/kxgettext.c:148: note: expected 'char *' but argument is of type 'const char * const' Thanks, fixed with From: Michal Marek Subject: kconfig: Propagate const Commit 2e7a091 made struct file->name a const char*, but forgot to constify all users of it. Reported-by: Stephen Rothwell Signed-off-by: Michal Marek --- scripts/kconfig/kxgettext.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c index dcc3fcc..e9d8e79 100644 --- a/scripts/kconfig/kxgettext.c +++ b/scripts/kconfig/kxgettext.c @@ -63,11 +63,11 @@ next: struct file_line { struct file_line *next; - char* file; - int lineno; + const char *file; + int lineno; }; -static struct file_line *file_line__new(char *file, int lineno) +static struct file_line *file_line__new(const char *file, int lineno) { struct file_line *self = malloc(sizeof(*self)); @@ -90,7 +90,8 @@ struct message { static struct message *message__list; -static struct message *message__new(const char *msg, char *option, char *file, int lineno) +static struct message *message__new(const char *msg, char *option, + const char *file, int lineno) { struct message *self = malloc(sizeof(*self)); @@ -130,7 +131,8 @@ static struct message *mesage__find(const char *msg) return m; } -static int message__add_file_line(struct message *self, char *file, int lineno) +static int message__add_file_line(struct message *self, const char *file, + int lineno) { int rc = -1; struct file_line *fl = file_line__new(file, lineno); @@ -145,7 +147,8 @@ out: return rc; } -static int message__add(const char *msg, char *option, char *file, int lineno) +static int message__add(const char *msg, char *option, const char *file, + int lineno) { int rc = 0; char bf[16384]; -- 1.7.1