Skip to content

L
linux
Commit cb20c28a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'hostprogs-wmissing-prototypes' of... 

Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc

* 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc:
  Makefile: Add -Wmising-prototypes to HOSTCFLAGS
  oss: Mark loadhex static in hex2hex.c
  dtc: Mark various internal functions static
  dtc: Set "noinput" in the lexer to avoid an unused function
  drm: radeon: Mark several functions static in mkregtable
  arch/sparc/boot/*.c: Mark various internal functions static
  arch/powerpc/boot/addRamDisk.c: Mark several internal functions static
  arch/alpha/boot/tools/objstrip.c: Mark "usage" static
  Documentation/vm/page-types.c: Declare checked_open static
  genksyms: Mark is_reserved_word static
  kconfig: Mark various internal functions static
  kconfig: Make zconf.y work with current bison
parents a08e37f3 25583d4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 338 additions and 309 deletions
Documentation/vm/page-types.c
View file @ cb20c28a
...@@ -218,7 +218,7 @@ static void fatal(const char *x, ...) ...@@ -218,7 +218,7 @@ static void fatal(const char *x, ...)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
int checked_open(const char *pathname, int flags) static int checked_open(const char *pathname, int flags)
{ {
int fd = open(pathname, flags); int fd = open(pathname, flags);
......
Makefile
View file @ cb20c28a
...@@ -221,7 +221,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ ...@@ -221,7 +221,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
HOSTCC = gcc HOSTCC = gcc
HOSTCXX = g++ HOSTCXX = g++
HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCXXFLAGS = -O2 HOSTCXXFLAGS = -O2
# Decide whether to build built-in, modular, or both. # Decide whether to build built-in, modular, or both.
......
arch/alpha/boot/tools/objstrip.c
View file @ cb20c28a
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
const char * prog_name; const char * prog_name;
void static void
usage (void) usage (void)
{ {
fprintf(stderr, fprintf(stderr,
......
arch/powerpc/boot/addRamDisk.c
View file @ cb20c28a
...@@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r) ...@@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r)
return 64; return 64;
} }
void get4k(FILE *file, char *buf ) static void get4k(FILE *file, char *buf )
{ {
unsigned j; unsigned j;
unsigned num = fread(buf, 1, 4096, file); unsigned num = fread(buf, 1, 4096, file);
...@@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf ) ...@@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf )
buf[j] = 0; buf[j] = 0;
} }
void put4k(FILE *file, char *buf ) static void put4k(FILE *file, char *buf )
{ {
fwrite(buf, 1, 4096, file); fwrite(buf, 1, 4096, file);
} }
void death(const char *msg, FILE *fdesc, const char *fname) static void death(const char *msg, FILE *fdesc, const char *fname)
{ {
fprintf(stderr, msg); fprintf(stderr, msg);
fclose(fdesc); fclose(fdesc);
......
arch/sparc/boot/btfixupprep.c
View file @ cb20c28a
...@@ -61,14 +61,14 @@ unsigned long lastfoffset = -1; ...@@ -61,14 +61,14 @@ unsigned long lastfoffset = -1;
unsigned long lastfrelno; unsigned long lastfrelno;
btfixup *lastf; btfixup *lastf;
void fatal(void) __attribute__((noreturn)); static void fatal(void) __attribute__((noreturn));
void fatal(void) static void fatal(void)
{ {
fprintf(stderr, "Malformed output from objdump\n%s\n", buffer); fprintf(stderr, "Malformed output from objdump\n%s\n", buffer);
exit(1); exit(1);
} }
btfixup *find(int type, char *name) static btfixup *find(int type, char *name)
{ {
int i; int i;
for (i = 0; i < last; i++) { for (i = 0; i < last; i++) {
...@@ -88,7 +88,7 @@ btfixup *find(int type, char *name) ...@@ -88,7 +88,7 @@ btfixup *find(int type, char *name)
return array + last - 1; return array + last - 1;
} }
void set_mode (char *buffer) static void set_mode (char *buffer)
{ {
for (mode = 0;; mode++) for (mode = 0;; mode++)
if (buffer[mode] < '0' || buffer[mode] > '9') if (buffer[mode] < '0' || buffer[mode] > '9')
......
arch/sparc/boot/piggyback_32.c
View file @ cb20c28a
...@@ -35,17 +35,17 @@ ...@@ -35,17 +35,17 @@
* as PROM looks for a.out image only. * as PROM looks for a.out image only.
*/ */
unsigned short ld2(char *p) static unsigned short ld2(char *p)
{ {
return (p[0] << 8) | p[1]; return (p[0] << 8) | p[1];
} }
unsigned int ld4(char *p) static unsigned int ld4(char *p)
{ {
return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
} }
void st4(char *p, unsigned int x) static void st4(char *p, unsigned int x)
{ {
p[0] = x >> 24; p[0] = x >> 24;
p[1] = x >> 16; p[1] = x >> 16;
...@@ -53,7 +53,7 @@ void st4(char *p, unsigned int x) ...@@ -53,7 +53,7 @@ void st4(char *p, unsigned int x)
p[3] = x; p[3] = x;
} }
void usage(void) static void usage(void)
{ {
/* fs_img.gz is an image of initial ramdisk. */ /* fs_img.gz is an image of initial ramdisk. */
fprintf(stderr, "Usage: piggyback vmlinux.aout System.map fs_img.gz\n"); fprintf(stderr, "Usage: piggyback vmlinux.aout System.map fs_img.gz\n");
...@@ -61,7 +61,7 @@ void usage(void) ...@@ -61,7 +61,7 @@ void usage(void)
exit(1); exit(1);
} }
void die(char *str) static void die(char *str)
{ {
perror (str); perror (str);
exit(1); exit(1);
......
arch/sparc/boot/piggyback_64.c
View file @ cb20c28a
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
/* Note: run this on an a.out kernel (use elftoaout for it), as PROM looks for a.out image onlly /* Note: run this on an a.out kernel (use elftoaout for it), as PROM looks for a.out image onlly
usage: piggyback vmlinux System.map tail, where tail is gzipped fs of the initial ramdisk */ usage: piggyback vmlinux System.map tail, where tail is gzipped fs of the initial ramdisk */
void die(char *str) static void die(char *str)
{ {
perror (str); perror (str);
exit(1); exit(1);
......
drivers/gpu/drm/radeon/mkregtable.c
View file @ cb20c28a
...@@ -561,7 +561,7 @@ struct table { ...@@ -561,7 +561,7 @@ struct table {
char *gpu_prefix; char *gpu_prefix;
}; };
struct offset *offset_new(unsigned o) static struct offset *offset_new(unsigned o)
{ {
struct offset *offset; struct offset *offset;
...@@ -573,12 +573,12 @@ struct offset *offset_new(unsigned o) ...@@ -573,12 +573,12 @@ struct offset *offset_new(unsigned o)
return offset; return offset;
} }
void table_offset_add(struct table *t, struct offset *offset) static void table_offset_add(struct table *t, struct offset *offset)
{ {
list_add_tail(&offset->list, &t->offsets); list_add_tail(&offset->list, &t->offsets);
} }
void table_init(struct table *t) static void table_init(struct table *t)
{ {
INIT_LIST_HEAD(&t->offsets); INIT_LIST_HEAD(&t->offsets);
t->offset_max = 0; t->offset_max = 0;
...@@ -586,7 +586,7 @@ void table_init(struct table *t) ...@@ -586,7 +586,7 @@ void table_init(struct table *t)
t->table = NULL; t->table = NULL;
} }
void table_print(struct table *t) static void table_print(struct table *t)
{ {
unsigned nlloop, i, j, n, c, id; unsigned nlloop, i, j, n, c, id;
...@@ -611,7 +611,7 @@ void table_print(struct table *t) ...@@ -611,7 +611,7 @@ void table_print(struct table *t)
printf("};\n"); printf("};\n");
} }
int table_build(struct table *t) static int table_build(struct table *t)
{ {
struct offset *offset; struct offset *offset;
unsigned i, m; unsigned i, m;
...@@ -631,7 +631,7 @@ int table_build(struct table *t) ...@@ -631,7 +631,7 @@ int table_build(struct table *t)
} }
static char gpu_name[10]; static char gpu_name[10];
int parser_auth(struct table *t, const char *filename) static int parser_auth(struct table *t, const char *filename)
{ {
FILE *file; FILE *file;
regex_t mask_rex; regex_t mask_rex;
......
scripts/dtc/data.c
View file @ cb20c28a
...@@ -217,7 +217,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m, ...@@ -217,7 +217,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m,
return d; return d;
} }
struct data data_append_markers(struct data d, struct marker *m) static struct data data_append_markers(struct data d, struct marker *m)
{ {
struct marker **mp = &d.markers; struct marker **mp = &d.markers;
......
scripts/dtc/dtc-lexer.l
View file @ cb20c28a
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* USA * USA
*/ */
%option noyywrap nounput yylineno %option noyywrap noinput nounput yylineno
%x INCLUDE %x INCLUDE
%x BYTESTRING %x BYTESTRING
......
scripts/dtc/dtc-lexer.lex.c_shipped
View file @ cb20c28a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 34 #define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
...@@ -54,7 +54,6 @@ typedef int flex_int32_t; ...@@ -54,7 +54,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */ /* Limits of integral types. */
#ifndef INT8_MIN #ifndef INT8_MIN
...@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t; ...@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
#ifdef __cplusplus #ifdef __cplusplus
...@@ -141,7 +142,15 @@ typedef unsigned int flex_uint32_t; ...@@ -141,7 +142,15 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */ /* Size of default input buffer. */
#ifndef YY_BUF_SIZE #ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384 #define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif #endif
/* The state buf must be large enough to hold one state per character in the main buffer. /* The state buf must be large enough to hold one state per character in the main buffer.
...@@ -192,13 +201,6 @@ extern FILE *yyin, *yyout; ...@@ -192,13 +201,6 @@ extern FILE *yyin, *yyout;
#define unput(c) yyunput( c, (yytext_ptr) ) #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).
* Given that the standard has decreed that size_t exists since 1989,
* I guess we can afford to depend on it. Manoj.
*/
#ifndef YY_TYPEDEF_YY_SIZE_T #ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t; typedef size_t yy_size_t;
...@@ -604,6 +606,7 @@ char *yytext; ...@@ -604,6 +606,7 @@ char *yytext;
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
*/ */
#define YY_NO_INPUT 1
...@@ -634,7 +637,7 @@ static int dts_version; /* = 0 */ ...@@ -634,7 +637,7 @@ static int dts_version; /* = 0 */
static void push_input_file(const char *filename); static void push_input_file(const char *filename);
static int pop_input_file(void); static int pop_input_file(void);
#line 638 "dtc-lexer.lex.c" #line 641 "dtc-lexer.lex.c"
#define INITIAL 0 #define INITIAL 0
#define INCLUDE 1 #define INCLUDE 1
...@@ -656,6 +659,35 @@ static int pop_input_file(void); ...@@ -656,6 +659,35 @@ static int pop_input_file(void);
static int yy_init_globals (void ); static int yy_init_globals (void );
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int yylex_destroy (void );
int yyget_debug (void );
void yyset_debug (int debug_flag );
YY_EXTRA_TYPE yyget_extra (void );
void yyset_extra (YY_EXTRA_TYPE user_defined );
FILE *yyget_in (void );
void yyset_in (FILE * in_str );
FILE *yyget_out (void );
void yyset_out (FILE * out_str );
int yyget_leng (void );
char *yyget_text (void );
int yyget_lineno (void );
void yyset_lineno (int line_number );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
*/ */
...@@ -688,7 +720,12 @@ static int input (void ); ...@@ -688,7 +720,12 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */ /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE #ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192 #define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif #endif
/* Copy whatever the last rule matched to the standard output. */ /* Copy whatever the last rule matched to the standard output. */
...@@ -696,7 +733,7 @@ static int input (void ); ...@@ -696,7 +733,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO fwrite( yytext, yyleng, 1, yyout ) #define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
...@@ -707,7 +744,7 @@ static int input (void ); ...@@ -707,7 +744,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
int n; \ size_t n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
...@@ -791,7 +828,7 @@ YY_DECL ...@@ -791,7 +828,7 @@ YY_DECL
#line 64 "dtc-lexer.l" #line 64 "dtc-lexer.l"
#line 795 "dtc-lexer.lex.c" #line 832 "dtc-lexer.lex.c"
if ( !(yy_init) ) if ( !(yy_init) )
{ {
...@@ -1116,7 +1153,7 @@ YY_RULE_SETUP ...@@ -1116,7 +1153,7 @@ YY_RULE_SETUP
#line 222 "dtc-lexer.l" #line 222 "dtc-lexer.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 1120 "dtc-lexer.lex.c" #line 1157 "dtc-lexer.lex.c"
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {
...@@ -1840,8 +1877,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) ...@@ -1840,8 +1877,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes. * scan from a @e copy of @a bytes.
* @param bytes the byte buffer to scan * @param yybytes the byte buffer to scan
* @param len the number of bytes in the buffer pointed to by @a bytes. * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* *
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
......
scripts/dtc/libfdt/fdt_ro.c
View file @ cb20c28a
...@@ -411,7 +411,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle) ...@@ -411,7 +411,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
&phandle, sizeof(phandle)); &phandle, sizeof(phandle));
} }
int _stringlist_contains(const char *strlist, int listlen, const char *str) static int _stringlist_contains(const char *strlist, int listlen, const char *str)
{ {
int len = strlen(str); int len = strlen(str);
const char *p; const char *p;
......
scripts/dtc/treesource.c
View file @ cb20c28a
...@@ -52,7 +52,7 @@ static void write_prefix(FILE *f, int level) ...@@ -52,7 +52,7 @@ static void write_prefix(FILE *f, int level)
fputc('\t', f); fputc('\t', f);
} }
int isstring(char c) static int isstring(char c)
{ {
return (isprint(c) return (isprint(c)
|| (c == '\0') || (c == '\0')
......
scripts/genksyms/keywords.c_shipped
View file @ cb20c28a
/* ANSI-C code produced by gperf version 3.0.2 */ /* ANSI-C code produced by gperf version 3.0.3 */
/* Command-line: gperf -L ANSI-C -a -C -E -g -H is_reserved_hash -k '1,3,$' -N is_reserved_word -p -t scripts/genksyms/keywords.gperf */ /* Command-line: gperf -L ANSI-C -a -C -E -g -H is_reserved_hash -k '1,3,$' -N is_reserved_word -p -t scripts/genksyms/keywords.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
#line 1 "scripts/genksyms/keywords.gperf" #line 1 "scripts/genksyms/keywords.gperf"
#line 3 "scripts/genksyms/keywords.gperf" struct resword;
static const struct resword *is_reserved_word(register const char *str, register unsigned int len);
#line 5 "scripts/genksyms/keywords.gperf"
struct resword { const char *name; int token; }; struct resword { const char *name; int token; };
/* maximum key range = 62, duplicates = 0 */ /* maximum key range = 62, duplicates = 0 */
...@@ -78,6 +80,9 @@ is_reserved_hash (register const char *str, register unsigned int len) ...@@ -78,6 +80,9 @@ is_reserved_hash (register const char *str, register unsigned int len)
#ifdef __GNUC__ #ifdef __GNUC__
__inline __inline
#ifdef __GNUC_STDC_INLINE__
__attribute__ ((__gnu_inline__))
#endif
#endif #endif
const struct resword * const struct resword *
is_reserved_word (register const char *str, register unsigned int len) is_reserved_word (register const char *str, register unsigned int len)
...@@ -94,105 +99,105 @@ is_reserved_word (register const char *str, register unsigned int len) ...@@ -94,105 +99,105 @@ is_reserved_word (register const char *str, register unsigned int len)
static const struct resword wordlist[] = static const struct resword wordlist[] =
{ {
{""}, {""}, {""}, {""}, {""}, {""},
#line 26 "scripts/genksyms/keywords.gperf" #line 28 "scripts/genksyms/keywords.gperf"
{"asm", ASM_KEYW}, {"asm", ASM_KEYW},
{""}, {""},
#line 8 "scripts/genksyms/keywords.gperf" #line 10 "scripts/genksyms/keywords.gperf"
{"__asm", ASM_KEYW}, {"__asm", ASM_KEYW},
{""}, {""},
#line 9 "scripts/genksyms/keywords.gperf" #line 11 "scripts/genksyms/keywords.gperf"
{"__asm__", ASM_KEYW}, {"__asm__", ASM_KEYW},
{""}, {""}, {""}, {""},
#line 52 "scripts/genksyms/keywords.gperf" #line 54 "scripts/genksyms/keywords.gperf"
{"__typeof__", TYPEOF_KEYW}, {"__typeof__", TYPEOF_KEYW},
{""}, {""},
#line 12 "scripts/genksyms/keywords.gperf" #line 14 "scripts/genksyms/keywords.gperf"
{"__const", CONST_KEYW}, {"__const", CONST_KEYW},
#line 11 "scripts/genksyms/keywords.gperf"
{"__attribute__", ATTRIBUTE_KEYW},
#line 13 "scripts/genksyms/keywords.gperf" #line 13 "scripts/genksyms/keywords.gperf"
{"__attribute__", ATTRIBUTE_KEYW},
#line 15 "scripts/genksyms/keywords.gperf"
{"__const__", CONST_KEYW}, {"__const__", CONST_KEYW},
#line 18 "scripts/genksyms/keywords.gperf" #line 20 "scripts/genksyms/keywords.gperf"
{"__signed__", SIGNED_KEYW}, {"__signed__", SIGNED_KEYW},
#line 44 "scripts/genksyms/keywords.gperf" #line 46 "scripts/genksyms/keywords.gperf"
{"static", STATIC_KEYW}, {"static", STATIC_KEYW},
#line 20 "scripts/genksyms/keywords.gperf" #line 22 "scripts/genksyms/keywords.gperf"
{"__volatile__", VOLATILE_KEYW}, {"__volatile__", VOLATILE_KEYW},
#line 39 "scripts/genksyms/keywords.gperf" #line 41 "scripts/genksyms/keywords.gperf"
{"int", INT_KEYW}, {"int", INT_KEYW},
#line 32 "scripts/genksyms/keywords.gperf" #line 34 "scripts/genksyms/keywords.gperf"
{"char", CHAR_KEYW}, {"char", CHAR_KEYW},
#line 33 "scripts/genksyms/keywords.gperf" #line 35 "scripts/genksyms/keywords.gperf"
{"const", CONST_KEYW}, {"const", CONST_KEYW},
#line 45 "scripts/genksyms/keywords.gperf" #line 47 "scripts/genksyms/keywords.gperf"
{"struct", STRUCT_KEYW}, {"struct", STRUCT_KEYW},
#line 24 "scripts/genksyms/keywords.gperf" #line 26 "scripts/genksyms/keywords.gperf"
{"__restrict__", RESTRICT_KEYW}, {"__restrict__", RESTRICT_KEYW},
#line 25 "scripts/genksyms/keywords.gperf" #line 27 "scripts/genksyms/keywords.gperf"
{"restrict", RESTRICT_KEYW}, {"restrict", RESTRICT_KEYW},
#line 23 "scripts/genksyms/keywords.gperf" #line 25 "scripts/genksyms/keywords.gperf"
{"_restrict", RESTRICT_KEYW}, {"_restrict", RESTRICT_KEYW},
#line 16 "scripts/genksyms/keywords.gperf" #line 18 "scripts/genksyms/keywords.gperf"
{"__inline__", INLINE_KEYW}, {"__inline__", INLINE_KEYW},
#line 10 "scripts/genksyms/keywords.gperf" #line 12 "scripts/genksyms/keywords.gperf"
{"__attribute", ATTRIBUTE_KEYW}, {"__attribute", ATTRIBUTE_KEYW},
{""}, {""},
#line 14 "scripts/genksyms/keywords.gperf" #line 16 "scripts/genksyms/keywords.gperf"
{"__extension__", EXTENSION_KEYW}, {"__extension__", EXTENSION_KEYW},
#line 35 "scripts/genksyms/keywords.gperf" #line 37 "scripts/genksyms/keywords.gperf"
{"enum", ENUM_KEYW}, {"enum", ENUM_KEYW},
#line 19 "scripts/genksyms/keywords.gperf" #line 21 "scripts/genksyms/keywords.gperf"
{"__volatile", VOLATILE_KEYW}, {"__volatile", VOLATILE_KEYW},
#line 36 "scripts/genksyms/keywords.gperf" #line 38 "scripts/genksyms/keywords.gperf"
{"extern", EXTERN_KEYW}, {"extern", EXTERN_KEYW},
{""}, {""},
#line 17 "scripts/genksyms/keywords.gperf" #line 19 "scripts/genksyms/keywords.gperf"
{"__signed", SIGNED_KEYW}, {"__signed", SIGNED_KEYW},
#line 7 "scripts/genksyms/keywords.gperf" #line 9 "scripts/genksyms/keywords.gperf"
{"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW}, {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
{""}, {""},
#line 51 "scripts/genksyms/keywords.gperf" #line 53 "scripts/genksyms/keywords.gperf"
{"typeof", TYPEOF_KEYW}, {"typeof", TYPEOF_KEYW},
#line 46 "scripts/genksyms/keywords.gperf" #line 48 "scripts/genksyms/keywords.gperf"
{"typedef", TYPEDEF_KEYW}, {"typedef", TYPEDEF_KEYW},
#line 15 "scripts/genksyms/keywords.gperf" #line 17 "scripts/genksyms/keywords.gperf"
{"__inline", INLINE_KEYW}, {"__inline", INLINE_KEYW},
#line 31 "scripts/genksyms/keywords.gperf" #line 33 "scripts/genksyms/keywords.gperf"
{"auto", AUTO_KEYW}, {"auto", AUTO_KEYW},
#line 47 "scripts/genksyms/keywords.gperf" #line 49 "scripts/genksyms/keywords.gperf"
{"union", UNION_KEYW}, {"union", UNION_KEYW},
{""}, {""}, {""}, {""},
#line 48 "scripts/genksyms/keywords.gperf" #line 50 "scripts/genksyms/keywords.gperf"
{"unsigned", UNSIGNED_KEYW}, {"unsigned", UNSIGNED_KEYW},
#line 49 "scripts/genksyms/keywords.gperf" #line 51 "scripts/genksyms/keywords.gperf"
{"void", VOID_KEYW}, {"void", VOID_KEYW},
#line 42 "scripts/genksyms/keywords.gperf" #line 44 "scripts/genksyms/keywords.gperf"
{"short", SHORT_KEYW}, {"short", SHORT_KEYW},
{""}, {""}, {""}, {""},
#line 50 "scripts/genksyms/keywords.gperf" #line 52 "scripts/genksyms/keywords.gperf"
{"volatile", VOLATILE_KEYW}, {"volatile", VOLATILE_KEYW},
{""}, {""},
#line 37 "scripts/genksyms/keywords.gperf" #line 39 "scripts/genksyms/keywords.gperf"
{"float", FLOAT_KEYW}, {"float", FLOAT_KEYW},
#line 34 "scripts/genksyms/keywords.gperf" #line 36 "scripts/genksyms/keywords.gperf"
{"double", DOUBLE_KEYW}, {"double", DOUBLE_KEYW},
{""}, {""},
#line 5 "scripts/genksyms/keywords.gperf" #line 7 "scripts/genksyms/keywords.gperf"
{"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW}, {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
{""}, {""}, {""}, {""},
#line 38 "scripts/genksyms/keywords.gperf" #line 40 "scripts/genksyms/keywords.gperf"
{"inline", INLINE_KEYW}, {"inline", INLINE_KEYW},
#line 6 "scripts/genksyms/keywords.gperf" #line 8 "scripts/genksyms/keywords.gperf"
{"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW}, {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
#line 41 "scripts/genksyms/keywords.gperf" #line 43 "scripts/genksyms/keywords.gperf"
{"register", REGISTER_KEYW}, {"register", REGISTER_KEYW},
{""}, {""},
#line 22 "scripts/genksyms/keywords.gperf" #line 24 "scripts/genksyms/keywords.gperf"
{"_Bool", BOOL_KEYW}, {"_Bool", BOOL_KEYW},
#line 43 "scripts/genksyms/keywords.gperf" #line 45 "scripts/genksyms/keywords.gperf"
{"signed", SIGNED_KEYW}, {"signed", SIGNED_KEYW},
{""}, {""}, {""}, {""},
#line 40 "scripts/genksyms/keywords.gperf" #line 42 "scripts/genksyms/keywords.gperf"
{"long", LONG_KEYW} {"long", LONG_KEYW}
}; };
......
scripts/genksyms/keywords.gperf
View file @ cb20c28a
%{ %{
struct resword;
static const struct resword *is_reserved_word(register const char *str, register unsigned int len);
%} %}
struct resword { const char *name; int token; } struct resword { const char *name; int token; }
%% %%
......
scripts/kconfig/lex.zconf.c_shipped
View file @ cb20c28a
...@@ -160,7 +160,15 @@ typedef unsigned int flex_uint32_t; ...@@ -160,7 +160,15 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */ /* Size of default input buffer. */
#ifndef YY_BUF_SIZE #ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384 #define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif #endif
/* The state buf must be large enough to hold one state per character in the main buffer. /* The state buf must be large enough to hold one state per character in the main buffer.
...@@ -802,7 +810,7 @@ static int last_ts, first_ts; ...@@ -802,7 +810,7 @@ static int last_ts, first_ts;
static void zconf_endhelp(void); static void zconf_endhelp(void);
static void zconf_endfile(void); static void zconf_endfile(void);
void new_string(void) static void new_string(void)
{ {
text = malloc(START_STRSIZE); text = malloc(START_STRSIZE);
text_asize = START_STRSIZE; text_asize = START_STRSIZE;
...@@ -810,7 +818,7 @@ void new_string(void) ...@@ -810,7 +818,7 @@ void new_string(void)
*text = 0; *text = 0;
} }
void append_string(const char *str, int size) static void append_string(const char *str, int size)
{ {
int new_size = text_size + size + 1; int new_size = text_size + size + 1;
if (new_size > text_asize) { if (new_size > text_asize) {
...@@ -824,7 +832,7 @@ void append_string(const char *str, int size) ...@@ -824,7 +832,7 @@ void append_string(const char *str, int size)
text[text_size] = 0; text[text_size] = 0;
} }
void alloc_string(const char *str, int size) static void alloc_string(const char *str, int size)
{ {
text = malloc(size + 1); text = malloc(size + 1);
memcpy(text, str, size); memcpy(text, str, size);
...@@ -914,7 +922,12 @@ static int input (void ); ...@@ -914,7 +922,12 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */ /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE #ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192 #define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif #endif
/* Copy whatever the last rule matched to the standard output. */ /* Copy whatever the last rule matched to the standard output. */
...@@ -922,7 +935,7 @@ static int input (void ); ...@@ -922,7 +935,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO fwrite( zconftext, zconfleng, 1, zconfout ) #define ECHO do { if (fwrite( zconftext, zconfleng, 1, zconfout )) {} } while (0)
#endif #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
...@@ -2060,8 +2073,8 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr ) ...@@ -2060,8 +2073,8 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will /** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
* scan from a @e copy of @a bytes. * scan from a @e copy of @a bytes.
* @param bytes the byte buffer to scan * @param yybytes the byte buffer to scan
* @param len the number of bytes in the buffer pointed to by @a bytes. * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* *
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
......
scripts/kconfig/zconf.gperf
View file @ cb20c28a
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
struct kconf_id; struct kconf_id;
static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
%% %%
mainmenu, T_MAINMENU, TF_COMMAND mainmenu, T_MAINMENU, TF_COMMAND
menu, T_MENU, TF_COMMAND menu, T_MENU, TF_COMMAND
......
scripts/kconfig/zconf.hash.c_shipped
View file @ cb20c28a
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#endif #endif
struct kconf_id; struct kconf_id;
static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
/* maximum key range = 47, duplicates = 0 */ /* maximum key range = 47, duplicates = 0 */
#ifdef __GNUC__ #ifdef __GNUC__
......
scripts/kconfig/zconf.l
View file @ cb20c28a
...@@ -39,7 +39,7 @@ static int last_ts, first_ts; ...@@ -39,7 +39,7 @@ static int last_ts, first_ts;
static void zconf_endhelp(void); static void zconf_endhelp(void);
static void zconf_endfile(void); static void zconf_endfile(void);
void new_string(void) static void new_string(void)
{ {
text = malloc(START_STRSIZE); text = malloc(START_STRSIZE);
text_asize = START_STRSIZE; text_asize = START_STRSIZE;
...@@ -47,7 +47,7 @@ void new_string(void) ...@@ -47,7 +47,7 @@ void new_string(void)
*text = 0; *text = 0;
} }
void append_string(const char *str, int size) static void append_string(const char *str, int size)
{ {
int new_size = text_size + size + 1; int new_size = text_size + size + 1;
if (new_size > text_asize) { if (new_size > text_asize) {
...@@ -61,7 +61,7 @@ void append_string(const char *str, int size) ...@@ -61,7 +61,7 @@ void append_string(const char *str, int size)
text[text_size] = 0; text[text_size] = 0;
} }
void alloc_string(const char *str, int size) static void alloc_string(const char *str, int size)
{ {
text = malloc(size + 1); text = malloc(size + 1);
memcpy(text, str, size); memcpy(text, str, size);
......
scripts/kconfig/zconf.tab.c_shipped
View file @ cb20c28a
This diff is collapsed.
scripts/kconfig/zconf.y
View file @ cb20c28a
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#define LKC_DIRECT_LINK #define LKC_DIRECT_LINK
#include "lkc.h" #include "lkc.h"
#include "zconf.hash.c"
#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
#define PRINTD 0x0001 #define PRINTD 0x0001
...@@ -100,6 +98,11 @@ static struct menu *current_menu, *current_entry; ...@@ -100,6 +98,11 @@ static struct menu *current_menu, *current_entry;
menu_end_menu(); menu_end_menu();
} if_entry menu_entry choice_entry } if_entry menu_entry choice_entry
%{
/* Include zconf.hash.c here so it can see the token constants. */
#include "zconf.hash.c"
%}
%% %%
input: stmt_list; input: stmt_list;
...@@ -501,7 +504,7 @@ void conf_parse(const char *name) ...@@ -501,7 +504,7 @@ void conf_parse(const char *name)
sym_set_change_count(1); sym_set_change_count(1);
} }
const char *zconf_tokenname(int token) static const char *zconf_tokenname(int token)
{ {
switch (token) { switch (token) {
case T_MENU: return "menu"; case T_MENU: return "menu";
...@@ -565,7 +568,7 @@ static void zconferror(const char *err) ...@@ -565,7 +568,7 @@ static void zconferror(const char *err)
#endif #endif
} }
void print_quoted_string(FILE *out, const char *str) static void print_quoted_string(FILE *out, const char *str)
{ {
const char *p; const char *p;
int len; int len;
...@@ -582,7 +585,7 @@ void print_quoted_string(FILE *out, const char *str) ...@@ -582,7 +585,7 @@ void print_quoted_string(FILE *out, const char *str)
putc('"', out); putc('"', out);
} }
void print_symbol(FILE *out, struct menu *menu) static void print_symbol(FILE *out, struct menu *menu)
{ {
struct symbol *sym = menu->sym; struct symbol *sym = menu->sym;
struct property *prop; struct property *prop;
......
sound/oss/hex2hex.c
View file @ cb20c28a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define MAX_SIZE (256*1024) #define MAX_SIZE (256*1024)
unsigned char buf[MAX_SIZE]; unsigned char buf[MAX_SIZE];
int loadhex(FILE *inf, unsigned char *buf) static int loadhex(FILE *inf, unsigned char *buf)
{ {
int l=0, c, i; int l=0, c, i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7