From patchwork Sun Sep 12 04:12:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 172812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8C4GQmf025031 for ; Sun, 12 Sep 2010 04:16:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750947Ab0ILEQX (ORCPT ); Sun, 12 Sep 2010 00:16:23 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:60548 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750894Ab0ILEQX (ORCPT ); Sun, 12 Sep 2010 00:16:23 -0400 Received: by gyd8 with SMTP id 8so1743713gyd.19 for ; Sat, 11 Sep 2010 21:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=D/I4gowfvfDqlm5bshDiFZscZWlUn9DkJTBigu8GgLY=; b=MtPPMsl+XJh/PiaqZD8b9sKkFLtplmfBRSev5mHZuZO8flCXGm070CSvnvEFElhFLX HP9SC+ciUbSJld1BJrvYlnYSRLGZIprzBJrp5a5CDEhfvFPfy6jLhILsdLggRnlCZAvJ qs/n0lxjruSGRwKZ8iE0u+2d6s5F89lAPznbk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=qYRQd6NH7zqr0Ckeja+tJ89FAkTn7iMnyMNeh8bl5+43krCHw/x4ZNEcTH/QIlSnjJ Udv5vXz8aUbDwmCnpYPVWaglWjfpbdw9LHjunJ44zVy8SlNSKCFa81YZCnQvoqBOO9Lh TwRMbZdj/5nmIKH0Svdg3Ly2tLT5DQUJO7Yoo= Received: by 10.100.197.4 with SMTP id u4mr2700324anf.17.1284264982123; Sat, 11 Sep 2010 21:16:22 -0700 (PDT) Received: from localhost.localdomain (69-165-136-93.dsl.teksavvy.com [69.165.136.93]) by mx.google.com with ESMTPS id x19sm7196825anc.5.2010.09.11.21.16.20 (version=SSLv3 cipher=RC4-MD5); Sat, 11 Sep 2010 21:16:21 -0700 (PDT) From: Arnaud Lacombe To: Sam Ravnborg , Michal Marek Cc: linux-kbuild , Arnaud Lacombe Subject: [DIFF] kbuild-generic-v5 -> kbuild-generic-v6 Date: Sun, 12 Sep 2010 00:12:24 -0400 Message-Id: <1284264744-27530-1-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.2.30.gc37d7.dirty In-Reply-To: <1284220282-3500-1-git-send-email-lacombar@gmail.com> References: <1284220282-3500-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 12 Sep 2010 04:16:27 +0000 (UTC) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index fbe571a..f7d89d7 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -807,11 +807,11 @@ int conf_write_autoconf(void) "\n"); fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" - " * Linux kernel version: %s\n" + " * %s\n" " * %s" " */\n" "#define AUTOCONF_INCLUDED\n", - sym_get_string_value(sym), ctime(&now)); + rootmenu.prompt->text, ctime(&now)); for_all_symbols(i, sym) { sym_calc_value(sym); diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 73608a6..6eb0397 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped @@ -2423,7 +2423,7 @@ int zconf_lineno(void) return current_pos.lineno; } -char *zconf_curname(void) +const char *zconf_curname(void) { return current_pos.file ? current_pos.file->name : ""; } diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 5d5f187..753cdbd 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -76,7 +76,7 @@ FILE *zconf_fopen(const char *name); void zconf_initscan(const char *name); void zconf_nextfile(const char *name); int zconf_lineno(void); -char *zconf_curname(void); +const char *zconf_curname(void); /* conf.c */ void xfgets(char *str, int size, FILE *in); diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 09d7a23..d433c7a 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -25,7 +25,7 @@ static const char mconf_readme[] = N_( "Overview\n" "--------\n" -"This interface let you select features and parameters for the build\n" +"This interface let you select features and parameters for the build.\n" "Features can either be built-in, modularized, or ignored. Parameters\n" "must be entered in as decimal or hexadecimal numbers or text.\n" "\n" diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index d629ffd..23acbdb 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -10,7 +10,7 @@ #include "lkc.h" static const char nohelp_text[] = N_( - "There is no help available for this kernel option.\n"); + "There is no help available for this option.\n"); struct menu rootmenu; static struct menu **last_entry_ptr; diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index c7fe9f0..ed93dd0 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -15,7 +15,7 @@ static const char nconf_readme[] = N_( "Overview\n" "--------\n" -"This interface let you select features and parameters for the build\n" +"This interface let you select features and parameters for the build.\n" "Features can either be built-in, modularized, or ignored. Parameters\n" "must be entered in as decimal or hexadecimal numbers or text.\n" "\n" @@ -127,8 +127,8 @@ static const char nconf_readme[] = N_( "Optional personality available\n" "------------------------------\n" "If you prefer to have all of the options listed in a single menu, rather\n" -"than the default multimenu hierarchy, run the menuconfig with\n" -"NCONFIG_MODE environment variable set to single_menu. Example:\n" +"than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n" +"environment variable set to single_menu. Example:\n" "\n" "make NCONFIG_MODE=single_menu nconfig\n" "\n" diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 584390d..6330cc8 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c @@ -16,7 +16,7 @@ struct file *file_lookup(const char *name) for (file = file_list; file; file = file->next) { if (!strcmp(name, file->name)) { - free(file_name); + free((void *)file_name); return file; } } diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index e0cbf8e..3dbaec1 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -354,7 +354,7 @@ int zconf_lineno(void) return current_pos.lineno; } -char *zconf_curname(void) +const char *zconf_curname(void) { return current_pos.file ? current_pos.file->name : ""; } diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped index fd8e9d8..699d4b2 100644 --- a/scripts/kconfig/zconf.tab.c_shipped +++ b/scripts/kconfig/zconf.tab.c_shipped @@ -2255,7 +2255,7 @@ void conf_parse(const char *name) prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); } - rootmenu.prompt->text = strdup(_(rootmenu.prompt->text)); + rootmenu.prompt->text = _(rootmenu.prompt->text); rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); menu_finalize(&rootmenu); diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index c95e67e..2abd3c7 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -503,7 +503,7 @@ void conf_parse(const char *name) prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); } - rootmenu.prompt->text = strdup(_(rootmenu.prompt->text)); + rootmenu.prompt->text = _(rootmenu.prompt->text); rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); menu_finalize(&rootmenu);