Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be2be1d5 authored by Adrian Bunk's avatar Adrian Bunk Committed by Sam Ravnborg
Browse files

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: default avatarAdrian Bunk <bunk@kernel.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent ea35455e

scripts/kconfig/lex.zconf.c_shipped

+72 −14
Original line number Diff line number Diff line
@@ -5,10 +5,29 @@ 


/* A lexical scanner generated by flex */



#define yy_create_buffer zconf_create_buffer

#define yy_delete_buffer zconf_delete_buffer

#define yy_flex_debug zconf_flex_debug

#define yy_init_buffer zconf_init_buffer

#define yy_flush_buffer zconf_flush_buffer

#define yy_load_buffer_state zconf_load_buffer_state

#define yy_switch_to_buffer zconf_switch_to_buffer

#define yyin zconfin

#define yyleng zconfleng

#define yylex zconflex

#define yylineno zconflineno

#define yyout zconfout

#define yyrestart zconfrestart

#define yytext zconftext

#define yywrap zconfwrap

#define yyalloc zconfalloc

#define yyrealloc zconfrealloc

#define yyfree zconffree



#define FLEX_SCANNER

#define YY_FLEX_MAJOR_VERSION 2

#define YY_FLEX_MINOR_VERSION 5

#define YY_FLEX_SUBMINOR_VERSION 33

#define YY_FLEX_SUBMINOR_VERSION 35

#if YY_FLEX_SUBMINOR_VERSION > 0

#define FLEX_BETA

#endif
@@ -30,7 +49,7 @@ 


/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */



#if __STDC_VERSION__ >= 199901L

#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L



/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,

 * if you want the limit (max/min) macros for int types.
@@ -53,7 +72,6 @@ typedef int flex_int32_t; 
typedef unsigned char flex_uint8_t; 

typedef unsigned short int flex_uint16_t;

typedef unsigned int flex_uint32_t;

#endif /* ! C99 */



/* Limits of integral types. */

#ifndef INT8_MIN
@@ -84,6 +102,8 @@ typedef unsigned int flex_uint32_t; 
#define UINT32_MAX             (4294967295U)

#endif



#endif /* ! C99 */



#endif /* ! FLEXINT_H */



#ifdef __cplusplus
@@ -93,11 +113,12 @@ typedef unsigned int flex_uint32_t; 


#else	/* ! __cplusplus */



#if __STDC__

/* C99 requires __STDC__ to be defined as 1. */

#if defined (__STDC__)



#define YY_USE_CONST



#endif	/* __STDC__ */

#endif	/* defined (__STDC__) */

#endif	/* ! __cplusplus */



#ifdef YY_USE_CONST
@@ -177,14 +198,9 @@ extern FILE *zconfin, *zconfout; 


#define unput(c) yyunput( c, (yytext_ptr)  )



/* The following is because we cannot portably get our hands on size_t

 * (without autoconf's help, which isn't available because we want

 * flex-generated scanners to compile on their own).

 */



#ifndef YY_TYPEDEF_YY_SIZE_T

#define YY_TYPEDEF_YY_SIZE_T

typedef unsigned int yy_size_t;

typedef size_t yy_size_t;

#endif



#ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -335,7 +351,7 @@ void zconffree (void * ); 


/* Begin user sect3 */



#define zconfwrap() 1

#define zconfwrap(n) 1

#define YY_SKIP_YYWRAP



typedef unsigned char YY_CHAR;
@@ -748,6 +764,7 @@ int zconf_flex_debug = 0; 
#define YY_MORE_ADJ 0

#define YY_RESTORE_YY_MORE_OFFSET

char *zconftext;

#define YY_NO_INPUT 1



/*

 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
@@ -834,6 +851,35 @@ void alloc_string(const char *str, int size) 


static int yy_init_globals (void );



/* Accessor methods to globals.

   These are made visible to non-reentrant scanners for convenience. */



int zconflex_destroy (void );



int zconfget_debug (void );



void zconfset_debug (int debug_flag  );



YY_EXTRA_TYPE zconfget_extra (void );



void zconfset_extra (YY_EXTRA_TYPE user_defined  );



FILE *zconfget_in (void );



void zconfset_in  (FILE * in_str  );



FILE *zconfget_out (void );



void zconfset_out  (FILE * out_str  );



int zconfget_leng (void );



char *zconfget_text (void );



int zconfget_lineno (void );



void zconfset_lineno (int line_number  );



/* Macros after this point can all be overridden by user definitions in

 * section 1.

 */
@@ -876,7 +922,7 @@ static int input (void ); 
/* This used to be an fputs(), but since the string might contain NUL's,

 * we now use fwrite().

 */

#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout )

#define ECHO fwrite( zconftext, zconfleng, 1, zconfout )

#endif



/* 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) 
	else

		ret_val = EOB_ACT_CONTINUE_SCAN;



	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {

		/* Extend the array by 50%, plus the number we really need. */

		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);

		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );

		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )

			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );

	}



	(yy_n_chars) += number_to_move;

	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;

	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1926,6 +1980,8 @@ static void zconfensure_buffer_stack (void) 
		(yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc

								(num_to_alloc * sizeof(struct yy_buffer_state*)

								);

		if ( ! (yy_buffer_stack) )

			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );

								  

		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
@@ -1944,6 +2000,8 @@ static void zconfensure_buffer_stack (void) 
								((yy_buffer_stack),

								num_to_alloc * sizeof(struct yy_buffer_state*)

								);

		if ( ! (yy_buffer_stack) )

			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );



		/* zero only the new slots.*/

		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));

scripts/kconfig/zconf.l

+1 −0
Original line number Diff line number Diff line 
%option backup nostdinit noyywrap never-interactive full ecs

%option 8bit backup nodefault perf-report perf-report

%option noinput

%x COMMAND HELP STRING PARAM

%{

/*