[PATCH 1/5] kbuild/nconf: fix spaces damage

[PATCH 1/5] kbuild/nconf: fix spaces damage

[Arnaud Lacombe]

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 scripts/kconfig/nconf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 272a987..eda49ff 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -248,7 +248,7 @@ search_help[] = N_(
 "Only relevant lines are shown.\n"
 "\n\n"
 "Search examples:\n"
-"Examples: USB   = > find all symbols containing USB\n"
+"Examples: USB  => find all symbols containing USB\n"
 "          ^USB => find all symbols starting with USB\n"
 "          USB$ => find all symbols ending with USB\n"
 "\n");
-- 
1.7.2.30.gc37d7.dirty

[PATCH 2/5] kbuild/gconf: add dummy inline for bind_textdomain_codeset()

[Arnaud Lacombe]

This symbols is used by gconf.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 scripts/kconfig/lkc.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 3633d5a..16eb416 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -14,6 +14,7 @@
 static inline const char *gettext(const char *txt) { return txt; }
 static inline void textdomain(const char *domainname) {}
 static inline void bindtextdomain(const char *name, const char *dir) {}
+static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
 #endif
 
 #ifdef __cplusplus
-- 
1.7.2.30.gc37d7.dirty

Re: [PATCH 2/5] kbuild/gconf: add dummy inline for bind_textdomain_codeset()

[Arnaud Lacombe]

Hi,

On Sun, Dec 5, 2010 at 1:41 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> This symbols is used by gconf.
>
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  scripts/kconfig/lkc.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
ping ?

 - Arnaud

> diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
> index 3633d5a..16eb416 100644
> --- a/scripts/kconfig/lkc.h
> +++ b/scripts/kconfig/lkc.h
> @@ -14,6 +14,7 @@
>  static inline const char *gettext(const char *txt) { return txt; }
>  static inline void textdomain(const char *domainname) {}
>  static inline void bindtextdomain(const char *name, const char *dir) {}
> +static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
>  #endif
>
>  #ifdef __cplusplus
> --
> 1.7.2.30.gc37d7.dirty
>
>

[PATCH 3/5] kconfig: fix typos

[Arnaud Lacombe]

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 scripts/kconfig/confdata.c |    6 +++---
 scripts/kconfig/symbol.c   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 6f2f3a4..b2d9486 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -992,7 +992,7 @@ static void randomize_choice_values(struct symbol *csym)
 	int cnt, def;
 
 	/*
-	 * If choice is mod then we may have more items slected
+	 * If choice is mod then we may have more items selected
 	 * and if no then no-one.
 	 * In both cases stop.
 	 */
@@ -1088,10 +1088,10 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
 
 	/*
 	 * We have different type of choice blocks.
-	 * If curr.tri equal to mod then we can select several
+	 * If curr.tri equals to mod then we can select several
 	 * choice symbols in one block.
 	 * In this case we do nothing.
-	 * If curr.tri equal yes then only one symbol can be
+	 * If curr.tri equals yes then only one symbol can be
 	 * selected in a choice block and we set it to yes,
 	 * and the rest to no.
 	 */
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index e42240d..3acce4d 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -688,7 +688,7 @@ const char *sym_get_string_default(struct symbol *sym)
 		switch (sym->type) {
 		case S_BOOLEAN:
 		case S_TRISTATE:
-			/* The visibility imay limit the value from yes => mod */
+			/* The visibility may limit the value from yes => mod */
 			val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri);
 			break;
 		default:
-- 
1.7.2.30.gc37d7.dirty

Re: [PATCH 3/5] kconfig: fix typos

[Arnaud Lacombe]

Hi,

On Sun, Dec 5, 2010 at 1:41 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  scripts/kconfig/confdata.c |    6 +++---
>  scripts/kconfig/symbol.c   |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
ping ?

 - Arnaud

> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index 6f2f3a4..b2d9486 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -992,7 +992,7 @@ static void randomize_choice_values(struct symbol *csym)
>        int cnt, def;
>
>        /*
> -        * If choice is mod then we may have more items slected
> +        * If choice is mod then we may have more items selected
>         * and if no then no-one.
>         * In both cases stop.
>         */
> @@ -1088,10 +1088,10 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
>
>        /*
>         * We have different type of choice blocks.
> -        * If curr.tri equal to mod then we can select several
> +        * If curr.tri equals to mod then we can select several
>         * choice symbols in one block.
>         * In this case we do nothing.
> -        * If curr.tri equal yes then only one symbol can be
> +        * If curr.tri equals yes then only one symbol can be
>         * selected in a choice block and we set it to yes,
>         * and the rest to no.
>         */
> diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
> index e42240d..3acce4d 100644
> --- a/scripts/kconfig/symbol.c
> +++ b/scripts/kconfig/symbol.c
> @@ -688,7 +688,7 @@ const char *sym_get_string_default(struct symbol *sym)
>                switch (sym->type) {
>                case S_BOOLEAN:
>                case S_TRISTATE:
> -                       /* The visibility imay limit the value from yes => mod */
> +                       /* The visibility may limit the value from yes => mod */
>                        val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri);
>                        break;
>                default:
> --
> 1.7.2.30.gc37d7.dirty
>
>

[PATCH 4/5] kconfig/conf: merge duplicate switch's case

[Arnaud Lacombe]

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 scripts/kconfig/conf.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 1b58129..8e33aa7 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -541,8 +541,6 @@ int main(int ac, char **av)
 		}
 		break;
 	case savedefconfig:
-		conf_read(NULL);
-		break;
 	case silentoldconfig:
 	case oldaskconfig:
 	case oldconfig:
-- 
1.7.2.30.gc37d7.dirty

Re: [PATCH 4/5] kconfig/conf: merge duplicate switch's case

[Arnaud Lacombe]

Hi,

On Sun, Dec 5, 2010 at 1:41 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  scripts/kconfig/conf.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
ping ?

 - Arnaud

> diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
> index 1b58129..8e33aa7 100644
> --- a/scripts/kconfig/conf.c
> +++ b/scripts/kconfig/conf.c
> @@ -541,8 +541,6 @@ int main(int ac, char **av)
>                }
>                break;
>        case savedefconfig:
> -               conf_read(NULL);
> -               break;
>        case silentoldconfig:
>        case oldaskconfig:
>        case oldconfig:
> --
> 1.7.2.30.gc37d7.dirty
>
>

[PATCH 5/5] kconfig: fix `zconfdebug' extern declaration

[Arnaud Lacombe]

This symbol is only exist if YYDEBUG is defined.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 scripts/kconfig/lkc.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 16eb416..2b856a8 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -68,10 +68,12 @@ struct kconf_id {
 	enum symbol_type stype;
 };
 
+#ifdef YYDEBUG
+extern int zconfdebug;
+#endif
+
 int zconfparse(void);
 void zconfdump(FILE *out);
-
-extern int zconfdebug;
 void zconf_starthelp(void);
 FILE *zconf_fopen(const char *name);
 void zconf_initscan(const char *name);
-- 
1.7.2.30.gc37d7.dirty

Re: [PATCH 5/5] kconfig: fix `zconfdebug' extern declaration

[Arnaud Lacombe]

Hi,

On Sun, Dec 5, 2010 at 1:41 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> This symbol is only exist if YYDEBUG is defined.
>
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  scripts/kconfig/lkc.h |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
ping ?

 - Arnaud

> diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
> index 16eb416..2b856a8 100644
> --- a/scripts/kconfig/lkc.h
> +++ b/scripts/kconfig/lkc.h
> @@ -68,10 +68,12 @@ struct kconf_id {
>        enum symbol_type stype;
>  };
>
> +#ifdef YYDEBUG
> +extern int zconfdebug;
> +#endif
> +
>  int zconfparse(void);
>  void zconfdump(FILE *out);
> -
> -extern int zconfdebug;
>  void zconf_starthelp(void);
>  FILE *zconf_fopen(const char *name);
>  void zconf_initscan(const char *name);
> --
> 1.7.2.30.gc37d7.dirty
>
>

Re: [PATCH 1/5] kbuild/nconf: fix spaces damage

[Arnaud Lacombe]

Hi,

On Sun, Dec 5, 2010 at 1:41 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  scripts/kconfig/nconf.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
ping ?

 - Arnaud

> diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
> index 272a987..eda49ff 100644
> --- a/scripts/kconfig/nconf.c
> +++ b/scripts/kconfig/nconf.c
> @@ -248,7 +248,7 @@ search_help[] = N_(
>  "Only relevant lines are shown.\n"
>  "\n\n"
>  "Search examples:\n"
> -"Examples: USB   = > find all symbols containing USB\n"
> +"Examples: USB  => find all symbols containing USB\n"
>  "          ^USB => find all symbols starting with USB\n"
>  "          USB$ => find all symbols ending with USB\n"
>  "\n");
> --
> 1.7.2.30.gc37d7.dirty
>
>

Re: [PATCH 1/5] kbuild/nconf: fix spaces damage

[Michal Marek]

On Sun, Dec 05, 2010 at 01:41:14AM -0500, Arnaud Lacombe wrote:
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  scripts/kconfig/nconf.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Thanks, applied this series to kbuild-2.6.git#kconfig.

Michal