Fix a few "unused parameter" warnings

diff --git a/src/flex.skl b/src/flex.skl
index 10b27e280bb9e7589fcefd72374691710c593d12..4d7539557dfb6a2f73e576279feb08309c6c6445 100644 (file)
--- a/src/flex.skl
+++ b/src/flex.skl
@@ -2498,7 +2498,8 @@ m4_ifdef( [[M4_YY_NO_TOP_STATE]],,
 %if-c-only
 static void yy_fatal_error YYFARGS1(yyconst char*, msg)
 {
-    m4_dnl M4_YY_DECL_GUTS_VAR();
+       M4_YY_DECL_GUTS_VAR();
+       M4_YY_NOOP_GUTS_VAR();
        (void) fprintf( stderr, "%s\n", msg );
        exit( YY_EXIT_FAILURE );
 }
@@ -2981,6 +2982,9 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 #ifndef yytext_ptr
 static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n)
 {
+       M4_YY_DECL_GUTS_VAR();
+       M4_YY_NOOP_GUTS_VAR();
+
        int i;
        for ( i = 0; i < n; ++i )
                s1[i] = s2[i];
@@ -3006,6 +3010,8 @@ m4_ifdef( [[M4_YY_NO_FLEX_ALLOC]],,
 [[
 void *yyalloc YYFARGS1( yy_size_t ,size)
 {
+       M4_YY_DECL_GUTS_VAR();
+       M4_YY_NOOP_GUTS_VAR();
        return (void *) malloc( size );
 }
 ]])
@@ -3014,6 +3020,9 @@ m4_ifdef( [[M4_YY_NO_FLEX_REALLOC]],,
 [[
 void *yyrealloc  YYFARGS2( void *,ptr, yy_size_t ,size)
 {
+       M4_YY_DECL_GUTS_VAR();
+       M4_YY_NOOP_GUTS_VAR();
+
        /* The cast to (char *) in the following accommodates both
         * implementations that use char* generic pointers, and those
         * that use void* generic pointers.  It works with the latter
@@ -3029,6 +3038,8 @@ m4_ifdef( [[M4_YY_NO_FLEX_FREE]],,
 [[
 void yyfree YYFARGS1( void *,ptr)
 {
+       M4_YY_DECL_GUTS_VAR();
+       M4_YY_NOOP_GUTS_VAR();
        free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
 }
 ]])
@@ -3123,6 +3134,9 @@ static int yytbl_hdr_read YYFARGS2(struct yytbl_hdr *, th, struct yytbl_reader *
 static struct yytbl_dmap *yytbl_dmap_lookup YYFARGS2(struct yytbl_dmap *, dmap,
                                                       int, id)
 {
+       M4_YY_DECL_GUTS_VAR();
+       M4_YY_NOOP_GUTS_VAR();
+
     while (dmap->dm_id)
         if (dmap->dm_id == id)
             return dmap;

diff --git a/src/libmain.c b/src/libmain.c
index d4d5b6d851506a964c6a73c8bf15158cc82b5513..f400fc3b4b6ef8415378de1461151245ef743297 100644 (file)
--- a/src/libmain.c
+++ b/src/libmain.c
@@ -25,8 +25,10 @@ extern int yylex (void);
 
 int     main (int argc, char *argv[])
 {
-       while (yylex () != 0)
-               continue;
+       (void)argc;
+       (void)argv;
+
+       while (yylex () != 0) ;
 
        return 0;
 }

diff --git a/src/parse.y b/src/parse.y
index d0cc706889cdac6728c7afe02b14ce0c431ba7eb..939cc05c02f06fc6f900f327c5bb56c0d53c9e75 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -1086,4 +1086,5 @@ int line;
 void yyerror( msg )
 const char *msg;
        {
+               (void)msg;
        }

diff --git a/tests/bison_nr_main.c b/tests/bison_nr_main.c
index 258575080424b74290598f10c79a426e309e8504..f5dd98a943269487b34d71b5171d34b39f6b486a 100644 (file)
--- a/tests/bison_nr_main.c
+++ b/tests/bison_nr_main.c
@@ -28,6 +28,9 @@ extern int testparse(void);
 
 int main ( int argc, char** argv )
 {
+       (void)argc;
+       (void)argv;
+
     /*yydebug =1;*/
     testin = stdin;
     testparse ( );

diff --git a/tests/bison_yylloc_main.c b/tests/bison_yylloc_main.c
index f9fb63d2d2f32fd5caa8b731dc9df323abb28a3b..0274d397db07bf6bc961b28b1c3401f1425477e1 100644 (file)
--- a/tests/bison_yylloc_main.c
+++ b/tests/bison_yylloc_main.c
@@ -27,6 +27,10 @@
 int main ( int argc, char** argv )
 {
     yyscan_t scanner;
+
+    (void)argc;
+    (void)argv;
+
     /*yydebug =1;*/
     testlex_init ( &scanner );
     testset_in(stdin,scanner);

diff --git a/tests/bison_yylloc_parser.y b/tests/bison_yylloc_parser.y
index d2dfc13476334e7e51ffdbf1d2bb4dc9d7f5e8ec..e807c4d036c9b2659e26ebca58b1fd744fc2b3b9 100644 (file)
--- a/tests/bison_yylloc_parser.y
+++ b/tests/bison_yylloc_parser.y
@@ -90,6 +90,7 @@ line:
 %%
 
 int yyerror(void* scanner, char* msg) {
+    (void)scanner;
     fprintf(stderr,"%s\n",msg);
     return 0;
 }

diff --git a/tests/bison_yylval_main.c b/tests/bison_yylval_main.c
index f615c4b670c2a9feae7dd6f815358360ad640a3e..fb0453816e96a75341f720259e48a0e9c6d0d08b 100644 (file)
--- a/tests/bison_yylval_main.c
+++ b/tests/bison_yylval_main.c
@@ -27,6 +27,10 @@
 int main ( int argc, char** argv )
 {
     yyscan_t scanner;
+
+    (void)argc;
+    (void)argv;
+
     /*yydebug =1;*/
     testlex_init ( &scanner );
     testset_in(stdin,scanner);

diff --git a/tests/bison_yylval_parser.y b/tests/bison_yylval_parser.y
index 626c5e77491ba7b6e03d455aa63e38a6cedc665d..a6ebfd327fe4d97fe03692e3206a2f5c1b52e61e 100644 (file)
--- a/tests/bison_yylval_parser.y
+++ b/tests/bison_yylval_parser.y
@@ -75,6 +75,7 @@ endtag:    LTSLASH TAGNAME GT { process_text($2);free($2);} ;
 %%
 
 int yyerror(void* scanner, char* msg) {
+    (void)scanner;
     fprintf(stderr,"%s\n",msg);
     return 0;
 }

diff --git a/tests/header_nr_main.c b/tests/header_nr_main.c
index 0ac60d9f00434774bfe1bb0098e44372237a389d..bb14749f0e3389b23df3202d7bceb141780663b4 100644 (file)
--- a/tests/header_nr_main.c
+++ b/tests/header_nr_main.c
@@ -26,6 +26,9 @@
 int
 main ( int argc, char** argv )
 {
+    (void)argc;
+    (void)argv;
+
     testin = stdin;
     testout = stdout;
     testlex();

diff --git a/tests/header_r_main.c b/tests/header_r_main.c
index 6c3dd8fb87b9409c3ecccec95b7e9976ecba5987..661457a91b347a63fb1a6e01626db1171d1373a3 100644 (file)
--- a/tests/header_r_main.c
+++ b/tests/header_r_main.c
@@ -30,6 +30,9 @@
 int
 main ( int argc, char** argv )
 {
+    (void)argc;
+    (void)argv;
+
     yyscan_t  scanner;
     FILE *fp;
     char * extra = "EXTRA";

diff --git a/tests/lineno_nr.l b/tests/lineno_nr.l
index 501ae1eaa74ba195c96dad2654b688aeb645bce6..3072de49d319e332f1cdf7093f77add64778ba7f 100644 (file)
--- a/tests/lineno_nr.l
+++ b/tests/lineno_nr.l
@@ -82,6 +82,8 @@ main ( argc,  argv )
     int argc;
     char** argv;
 {
+    (void)argv;
+
     if( argc > 1 )
         printf("%d\n", count_newlines(stdin));
 

diff --git a/tests/lineno_r.l b/tests/lineno_r.l
index 4132ed37c051edf64974790bd757518c29cc2ebf..443357577eee12ea7ea81e1d589e1935973e7e85 100644 (file)
--- a/tests/lineno_r.l
+++ b/tests/lineno_r.l
@@ -82,6 +82,8 @@ main (argc, argv)
     int argc;
     char ** argv;
 {
+    (void)argv;
+
     if( argc > 1 )
         printf("%d\n", count_newlines(stdin));
 

diff --git a/tests/lineno_trailing.l b/tests/lineno_trailing.l
index 9e83dab5c83139c1b6be01a72c1ba4a919ba37ca..9ac2c84332641cc50dfd545a8bdf4155af4bcbb2 100644 (file)
--- a/tests/lineno_trailing.l
+++ b/tests/lineno_trailing.l
@@ -75,6 +75,8 @@ main ( argc,  argv )
     int argc;
     char** argv;
 {
+    (void)argv;
+
     if( argc > 1 )
         printf("%d\n", count_newlines(stdin));
 

diff --git a/tests/mem_r.l b/tests/mem_r.l
index 861a7b7914703a6b2c265e71b3914a5325741955..ec150c0a237f63f079138d5f0753d24bc41a8046 100644 (file)
--- a/tests/mem_r.l
+++ b/tests/mem_r.l
@@ -87,6 +87,8 @@ static void dump_mem(FILE* fp){
 
 void * yyalloc(yy_size_t n , void* yyscanner)
 {
+    (void)yyscanner;
+
     void * p;
     int i;
 
@@ -116,6 +118,8 @@ void * yyalloc(yy_size_t n , void* yyscanner)
 
 void * yyrealloc(void* p, yy_size_t n , void* yyscanner)
 {
+    (void)yyscanner;
+
     int i;
     for (i=0; i < arrsz; i++)
         if ( ptrs[i].p == p){
@@ -137,6 +141,8 @@ void * yyrealloc(void* p, yy_size_t n , void* yyscanner)
 
 void yyfree(void* p , void* yyscanner)
 {
+    (void)yyscanner;
+
     int i;
     for (i=0; i < arrsz; i++)
         if ( ptrs[i].p == p){

diff --git a/tests/multiple_scanners_nr_main.c b/tests/multiple_scanners_nr_main.c
index 3763dbc72c92457a6e33604c1fb7b7eefc185670..ff1a6d5c7fdb553ae2add2338db8054ce9945b3c 100644 (file)
--- a/tests/multiple_scanners_nr_main.c
+++ b/tests/multiple_scanners_nr_main.c
@@ -27,6 +27,9 @@
 int
 main ( int argc, char** argv )
 {
+    (void)argc;
+    (void)argv;
+
     int S1_ok=1, S2_ok=1;
     YY_BUFFER_STATE buff1, buff2;
     S1_out = S2_out = stdout;

diff --git a/tests/multiple_scanners_r_main.c b/tests/multiple_scanners_r_main.c
index 1b3ea0a7318013498ad20dd3c6b1a08916ef0b9b..ea73806a253f3bca889f4e6f33cd1c177f2f0e4f 100644 (file)
--- a/tests/multiple_scanners_r_main.c
+++ b/tests/multiple_scanners_r_main.c
@@ -27,6 +27,9 @@
 int
 main ( int argc, char** argv )
 {
+    (void)argc;
+    (void)argv;
+
     int S1_ok=1, S2_ok=1;
     FILE * fp;
     YY_BUFFER_STATE buff1, buff2;

diff --git a/tests/pthread.l b/tests/pthread.l
index 1084321b97611980ecf2de2ce81f646cd3332e1d..985d21452ce0125e52d7c5681b64cc213217484b 100644 (file)
--- a/tests/pthread.l
+++ b/tests/pthread.l
@@ -78,9 +78,13 @@ static int process_text(char* s, yyscan_t  scanner);
 <INITIAL,STATE_1,STATE_2>[[:space:]\r\n]+  { }
 %%
 
-int yywrap( yyscan_t  scanner) { return 1; }
+int yywrap( yyscan_t  scanner) {
+    (void)scanner;
+    return 1;
+}
 static int process_text(char* s, yyscan_t  scanner)
 {
+    (void)scanner;
     return (int)(*s) + (int) *(s + yyget_leng(scanner)-1);
 }
 
@@ -114,6 +118,8 @@ void * thread_func ( void* arg )
 {
     int i;
 
+    (void)arg;
+
     /* Wait for go-ahead. */
     pthread_mutex_lock( &go_ahead);
     pthread_mutex_unlock(&go_ahead);

diff --git a/tests/rescan_nr.direct.l b/tests/rescan_nr.direct.l
index 18f29bba239fd3b891783881b84a43933799a652..84de3a4ef08ab437af254c808308eacdda75a8fe 100644 (file)
--- a/tests/rescan_nr.direct.l
+++ b/tests/rescan_nr.direct.l
@@ -51,6 +51,8 @@ main (int argc, char* const argv[])
     FILE* fp;
     int i;
 
+    (void)argc;
+
     if ((fp = fopen(argv[1],"r")) == NULL){
         perror("Failed to open input file.");
         return 1;

diff --git a/tests/rescan_r.direct.l b/tests/rescan_r.direct.l
index a6073dd3b002b762ba2327197ced010e971b5baf..7cc8857f3937ca5bec3ef43a45438aa12a56048a 100644 (file)
--- a/tests/rescan_r.direct.l
+++ b/tests/rescan_r.direct.l
@@ -52,6 +52,8 @@ main (int argc, char* const argv[])
     int i;
     yyscan_t  yyscanner;
 
+    (void)argc;
+
     if ((fp = fopen(argv[1],"r")) == NULL){
         perror("Failed to open input file.");
         return 1;

diff --git a/tests/top_main.c b/tests/top_main.c
index 3ac436dbb615caf44e59ee3c7b058b0eec1c9aed..d383ce5c94f3bd0a1cc2361b3a7a9453b31a07db 100644 (file)
--- a/tests/top_main.c
+++ b/tests/top_main.c
@@ -30,6 +30,9 @@
 int
 main ( int argc, char** argv )
 {
+    (void)argc;
+    (void)argv;
+
     yyscan_t  scanner;
     FILE *fp;
     char * extra = "EXTRA";