diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-16 19:07:59 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-07-30 16:29:50 -0400 |
commit | be2be1d59035a28debb22555f103e676a8f74186 (patch) | |
tree | ce5f543a4d86e13cf4d93194556a8d07b9757fa9 | |
parent | ea35455e0dc17d732436a5b98bd511cab64eb10e (diff) |
kconfig: scripts/kconfig/zconf.l: add %option noinput
gcc 4.3 correctly determines that input() is unused and gives the
following warning:
<-- snip -->
...
HOSTCC scripts/kconfig/zconf.tab.o
scripts/kconfig/lex.zconf.c:1628: warning: ‘input’ defined but not used
...
<-- snip -->
Fix it by adding %option noinput to scripts/kconfig/zconf.l and
regeneration of scripts/kconfig/lex.zconf.c_shipped.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 86 | ||||
-rw-r--r-- | scripts/kconfig/zconf.l | 1 |
2 files changed, 73 insertions, 14 deletions
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 6a61cee4a32c..7342ce0a7780 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped | |||
@@ -5,10 +5,29 @@ | |||
5 | 5 | ||
6 | /* A lexical scanner generated by flex */ | 6 | /* A lexical scanner generated by flex */ |
7 | 7 | ||
8 | #define yy_create_buffer zconf_create_buffer | ||
9 | #define yy_delete_buffer zconf_delete_buffer | ||
10 | #define yy_flex_debug zconf_flex_debug | ||
11 | #define yy_init_buffer zconf_init_buffer | ||
12 | #define yy_flush_buffer zconf_flush_buffer | ||
13 | #define yy_load_buffer_state zconf_load_buffer_state | ||
14 | #define yy_switch_to_buffer zconf_switch_to_buffer | ||
15 | #define yyin zconfin | ||
16 | #define yyleng zconfleng | ||
17 | #define yylex zconflex | ||
18 | #define yylineno zconflineno | ||
19 | #define yyout zconfout | ||
20 | #define yyrestart zconfrestart | ||
21 | #define yytext zconftext | ||
22 | #define yywrap zconfwrap | ||
23 | #define yyalloc zconfalloc | ||
24 | #define yyrealloc zconfrealloc | ||
25 | #define yyfree zconffree | ||
26 | |||
8 | #define FLEX_SCANNER | 27 | #define FLEX_SCANNER |
9 | #define YY_FLEX_MAJOR_VERSION 2 | 28 | #define YY_FLEX_MAJOR_VERSION 2 |
10 | #define YY_FLEX_MINOR_VERSION 5 | 29 | #define YY_FLEX_MINOR_VERSION 5 |
11 | #define YY_FLEX_SUBMINOR_VERSION 33 | 30 | #define YY_FLEX_SUBMINOR_VERSION 35 |
12 | #if YY_FLEX_SUBMINOR_VERSION > 0 | 31 | #if YY_FLEX_SUBMINOR_VERSION > 0 |
13 | #define FLEX_BETA | 32 | #define FLEX_BETA |
14 | #endif | 33 | #endif |
@@ -30,7 +49,7 @@ | |||
30 | 49 | ||
31 | /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ | 50 | /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ |
32 | 51 | ||
33 | #if __STDC_VERSION__ >= 199901L | 52 | #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L |
34 | 53 | ||
35 | /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, | 54 | /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, |
36 | * if you want the limit (max/min) macros for int types. | 55 | * if you want the limit (max/min) macros for int types. |
@@ -53,7 +72,6 @@ typedef int flex_int32_t; | |||
53 | typedef unsigned char flex_uint8_t; | 72 | typedef unsigned char flex_uint8_t; |
54 | typedef unsigned short int flex_uint16_t; | 73 | typedef unsigned short int flex_uint16_t; |
55 | typedef unsigned int flex_uint32_t; | 74 | typedef unsigned int flex_uint32_t; |
56 | #endif /* ! C99 */ | ||
57 | 75 | ||
58 | /* Limits of integral types. */ | 76 | /* Limits of integral types. */ |
59 | #ifndef INT8_MIN | 77 | #ifndef INT8_MIN |
@@ -84,6 +102,8 @@ typedef unsigned int flex_uint32_t; | |||
84 | #define UINT32_MAX (4294967295U) | 102 | #define UINT32_MAX (4294967295U) |
85 | #endif | 103 | #endif |
86 | 104 | ||
105 | #endif /* ! C99 */ | ||
106 | |||
87 | #endif /* ! FLEXINT_H */ | 107 | #endif /* ! FLEXINT_H */ |
88 | 108 | ||
89 | #ifdef __cplusplus | 109 | #ifdef __cplusplus |
@@ -93,11 +113,12 @@ typedef unsigned int flex_uint32_t; | |||
93 | 113 | ||
94 | #else /* ! __cplusplus */ | 114 | #else /* ! __cplusplus */ |
95 | 115 | ||
96 | #if __STDC__ | 116 | /* C99 requires __STDC__ to be defined as 1. */ |
117 | #if defined (__STDC__) | ||
97 | 118 | ||
98 | #define YY_USE_CONST | 119 | #define YY_USE_CONST |
99 | 120 | ||
100 | #endif /* __STDC__ */ | 121 | #endif /* defined (__STDC__) */ |
101 | #endif /* ! __cplusplus */ | 122 | #endif /* ! __cplusplus */ |
102 | 123 | ||
103 | #ifdef YY_USE_CONST | 124 | #ifdef YY_USE_CONST |
@@ -177,14 +198,9 @@ extern FILE *zconfin, *zconfout; | |||
177 | 198 | ||
178 | #define unput(c) yyunput( c, (yytext_ptr) ) | 199 | #define unput(c) yyunput( c, (yytext_ptr) ) |
179 | 200 | ||
180 | /* The following is because we cannot portably get our hands on size_t | ||
181 | * (without autoconf's help, which isn't available because we want | ||
182 | * flex-generated scanners to compile on their own). | ||
183 | */ | ||
184 | |||
185 | #ifndef YY_TYPEDEF_YY_SIZE_T | 201 | #ifndef YY_TYPEDEF_YY_SIZE_T |
186 | #define YY_TYPEDEF_YY_SIZE_T | 202 | #define YY_TYPEDEF_YY_SIZE_T |
187 | typedef unsigned int yy_size_t; | 203 | typedef size_t yy_size_t; |
188 | #endif | 204 | #endif |
189 | 205 | ||
190 | #ifndef YY_STRUCT_YY_BUFFER_STATE | 206 | #ifndef YY_STRUCT_YY_BUFFER_STATE |
@@ -335,7 +351,7 @@ void zconffree (void * ); | |||
335 | 351 | ||
336 | /* Begin user sect3 */ | 352 | /* Begin user sect3 */ |
337 | 353 | ||
338 | #define zconfwrap() 1 | 354 | #define zconfwrap(n) 1 |
339 | #define YY_SKIP_YYWRAP | 355 | #define YY_SKIP_YYWRAP |
340 | 356 | ||
341 | typedef unsigned char YY_CHAR; | 357 | typedef unsigned char YY_CHAR; |
@@ -748,6 +764,7 @@ int zconf_flex_debug = 0; | |||
748 | #define YY_MORE_ADJ 0 | 764 | #define YY_MORE_ADJ 0 |
749 | #define YY_RESTORE_YY_MORE_OFFSET | 765 | #define YY_RESTORE_YY_MORE_OFFSET |
750 | char *zconftext; | 766 | char *zconftext; |
767 | #define YY_NO_INPUT 1 | ||
751 | 768 | ||
752 | /* | 769 | /* |
753 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> | 770 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> |
@@ -834,6 +851,35 @@ void alloc_string(const char *str, int size) | |||
834 | 851 | ||
835 | static int yy_init_globals (void ); | 852 | static int yy_init_globals (void ); |
836 | 853 | ||
854 | /* Accessor methods to globals. | ||
855 | These are made visible to non-reentrant scanners for convenience. */ | ||
856 | |||
857 | int zconflex_destroy (void ); | ||
858 | |||
859 | int zconfget_debug (void ); | ||
860 | |||
861 | void zconfset_debug (int debug_flag ); | ||
862 | |||
863 | YY_EXTRA_TYPE zconfget_extra (void ); | ||
864 | |||
865 | void zconfset_extra (YY_EXTRA_TYPE user_defined ); | ||
866 | |||
867 | FILE *zconfget_in (void ); | ||
868 | |||
869 | void zconfset_in (FILE * in_str ); | ||
870 | |||
871 | FILE *zconfget_out (void ); | ||
872 | |||
873 | void zconfset_out (FILE * out_str ); | ||
874 | |||
875 | int zconfget_leng (void ); | ||
876 | |||
877 | char *zconfget_text (void ); | ||
878 | |||
879 | int zconfget_lineno (void ); | ||
880 | |||
881 | void zconfset_lineno (int line_number ); | ||
882 | |||
837 | /* Macros after this point can all be overridden by user definitions in | 883 | /* Macros after this point can all be overridden by user definitions in |
838 | * section 1. | 884 | * section 1. |
839 | */ | 885 | */ |
@@ -876,7 +922,7 @@ static int input (void ); | |||
876 | /* This used to be an fputs(), but since the string might contain NUL's, | 922 | /* This used to be an fputs(), but since the string might contain NUL's, |
877 | * we now use fwrite(). | 923 | * we now use fwrite(). |
878 | */ | 924 | */ |
879 | #define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout ) | 925 | #define ECHO fwrite( zconftext, zconfleng, 1, zconfout ) |
880 | #endif | 926 | #endif |
881 | 927 | ||
882 | /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, | 928 | /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, |
@@ -1540,6 +1586,14 @@ static int yy_get_next_buffer (void) | |||
1540 | else | 1586 | else |
1541 | ret_val = EOB_ACT_CONTINUE_SCAN; | 1587 | ret_val = EOB_ACT_CONTINUE_SCAN; |
1542 | 1588 | ||
1589 | if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { | ||
1590 | /* Extend the array by 50%, plus the number we really need. */ | ||
1591 | yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); | ||
1592 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); | ||
1593 | if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) | ||
1594 | YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); | ||
1595 | } | ||
1596 | |||
1543 | (yy_n_chars) += number_to_move; | 1597 | (yy_n_chars) += number_to_move; |
1544 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; | 1598 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; |
1545 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; | 1599 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; |
@@ -1926,7 +1980,9 @@ static void zconfensure_buffer_stack (void) | |||
1926 | (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc | 1980 | (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc |
1927 | (num_to_alloc * sizeof(struct yy_buffer_state*) | 1981 | (num_to_alloc * sizeof(struct yy_buffer_state*) |
1928 | ); | 1982 | ); |
1929 | 1983 | if ( ! (yy_buffer_stack) ) | |
1984 | YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); | ||
1985 | |||
1930 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); | 1986 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); |
1931 | 1987 | ||
1932 | (yy_buffer_stack_max) = num_to_alloc; | 1988 | (yy_buffer_stack_max) = num_to_alloc; |
@@ -1944,6 +2000,8 @@ static void zconfensure_buffer_stack (void) | |||
1944 | ((yy_buffer_stack), | 2000 | ((yy_buffer_stack), |
1945 | num_to_alloc * sizeof(struct yy_buffer_state*) | 2001 | num_to_alloc * sizeof(struct yy_buffer_state*) |
1946 | ); | 2002 | ); |
2003 | if ( ! (yy_buffer_stack) ) | ||
2004 | YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); | ||
1947 | 2005 | ||
1948 | /* zero only the new slots.*/ | 2006 | /* zero only the new slots.*/ |
1949 | memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); | 2007 | memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); |
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 4cea5c85cd0a..5164ef7ce499 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l | |||
@@ -1,5 +1,6 @@ | |||
1 | %option backup nostdinit noyywrap never-interactive full ecs | 1 | %option backup nostdinit noyywrap never-interactive full ecs |
2 | %option 8bit backup nodefault perf-report perf-report | 2 | %option 8bit backup nodefault perf-report perf-report |
3 | %option noinput | ||
3 | %x COMMAND HELP STRING PARAM | 4 | %x COMMAND HELP STRING PARAM |
4 | %{ | 5 | %{ |
5 | /* | 6 | /* |