From owner-freebsd-audit  Wed Sep 12 12:38:49 2001
Delivered-To: freebsd-audit@freebsd.org
Received: from arb.arb.za.net (mail.powerbox.co.za [196.7.148.4])
	by hub.freebsd.org (Postfix) with ESMTP id D205937B405
	for <audit@freebsd.org>; Wed, 12 Sep 2001 12:37:09 -0700 (PDT)
Received: (from uucp@localhost)
	by arb.arb.za.net (8.11.3/8.11.3) with UUCP id f8CJb7E69532
	for audit@freebsd.org; Wed, 12 Sep 2001 21:37:07 +0200 (SAST)
	(envelope-from mark@grondar.za)
Received: from grondar.za (localhost [127.0.0.1])
	by grimreaper.grondar.za (8.11.6/8.11.4) with ESMTP id f8CJY6u89490
	for <audit@freebsd.org>; Wed, 12 Sep 2001 20:34:06 +0100 (BST)
	(envelope-from mark@grondar.za)
Message-Id: <200109121934.f8CJY6u89490@grimreaper.grondar.za>
To: audit@freebsd.org
Subject: WARNS=2 cleanup for lex and yacc
Date: Wed, 12 Sep 2001 20:34:05 +0100
From: Mark Murray <mark@grondar.za>
Sender: owner-freebsd-audit@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-audit.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-audit>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-audit>
X-Loop: FreeBSD.ORG

Hi

Please review

Thanks!

M
Index: lex/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/Makefile,v
retrieving revision 1.16
diff -u -d -r1.16 Makefile
--- lex/Makefile	27 Mar 2001 10:51:48 -0000	1.16
+++ lex/Makefile	12 Sep 2001 17:04:32 -0000
@@ -22,6 +22,9 @@
 MLINKS+=	lex.1 flex++.1
 MLINKS+=	lex.1 lex++.1
 
+NO_WERROR=	true	# Flex builds itself; the "unwarned" flex has warnings
+WARNS?=		2
+
 CLEANFILES=	scan.c skel.c
 
 .if !defined(NOLIB)
Index: lex/flex.skl
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/flex.skl,v
retrieving revision 1.6
diff -u -d -r1.6 flex.skl
--- lex/flex.skl	22 Jul 2001 23:14:33 -0000	1.6
+++ lex/flex.skl	12 Sep 2001 16:06:32 -0000
@@ -240,19 +240,19 @@
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void yyrestart YY_PROTO(( FILE * ));
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE ));
 void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *, int ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE, FILE * ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE ));
 #define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *, yy_size_t ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char * ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *, int ));
 %*
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
@@ -281,9 +281,9 @@
 
 %- Standard (non-C++) definition
 static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type ));
 static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+static void yy_fatal_error YY_PROTO(( yyconst char [] ));
 %*
 
 /* Done after the current pattern has been matched and before the
@@ -313,7 +313,7 @@
 
 %-
 #ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+static void yyunput YY_PROTO(( int, char * ));
 #endif
 %*
 
@@ -340,7 +340,7 @@
 static int yy_start_stack_depth = 0;
 static int *yy_start_stack = 0;
 #ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
+static void yy_push_state YY_PROTO(( int ));
 #endif
 #ifndef YY_NO_POP_STATE
 static void yy_pop_state YY_PROTO(( void ));
@@ -1257,18 +1257,18 @@
 #ifndef YY_NO_SCAN_BUFFER
 %-
 #ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+YY_BUFFER_STATE yy_scan_buffer( char *__base, yy_size_t __size )
 #else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
+YY_BUFFER_STATE yy_scan_buffer( __base, __size )
+char *__base;
+yy_size_t __size;
 #endif
 	{
 	YY_BUFFER_STATE b;
 
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+	if ( __size < 2 ||
+	     __base[__size-2] != YY_END_OF_BUFFER_CHAR ||
+	     __base[__size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
@@ -1276,8 +1276,8 @@
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_buf_size = __size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = __base;
 	b->yy_is_our_buffer = 0;
 	b->yy_input_file = 0;
 	b->yy_n_chars = b->yy_buf_size;
Index: lex/flexdef.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/flexdef.h,v
retrieving revision 1.5
diff -u -d -r1.5 flexdef.h
--- lex/flexdef.h	27 Oct 1999 07:56:44 -0000	1.5
+++ lex/flexdef.h	12 Sep 2001 16:57:29 -0000
@@ -29,8 +29,9 @@
 /* @(#) $Header: /home/daffy/u0/vern/flex/RCS/flexdef.h,v 2.53 95/04/20 11:17:36 vern Exp $ (LBL) */
 /* $FreeBSD: src/usr.bin/lex/flexdef.h,v 1.5 1999/10/27 07:56:44 obrien Exp $ */
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include "config.h"
 
@@ -432,13 +433,14 @@
 extern FILE *skelfile, *yyin, *backing_up_file;
 extern const char *skel[];
 extern int skel_ind;
-extern char *infilename, *outfilename;
+extern char *infilename;
+extern const char *outfilename;
 extern int did_outfilename;
-extern char *prefix, *yyclass;
+extern const char *prefix, *yyclass;
 extern int do_stdinit, use_stdout;
 extern char **input_files;
 extern int num_input_files;
-extern char *program_name;
+extern const char *program_name;
 
 extern char *action_array;
 extern int action_size;
@@ -790,10 +792,10 @@
 extern void gentabs PROTO((void));
 
 /* Write out a formatted string at the current indentation level. */
-extern void indent_put2s PROTO((char[], char[]));
+extern void indent_put2s PROTO((const char[], const char[]));
 
 /* Write out a string + newline at the current indentation level. */
-extern void indent_puts PROTO((char[]));
+extern void indent_puts PROTO((const char[]));
 
 extern void make_tables PROTO((void));	/* generate transition tables */
 
@@ -808,10 +810,10 @@
 /* from file misc.c */
 
 /* Add a #define to the action file. */
-extern void action_define PROTO(( char *defname, int value ));
+extern void action_define PROTO(( const char *defname, int value ));
 
 /* Add the given text to the stored actions. */
-extern void add_action PROTO(( char *new_text ));
+extern void add_action PROTO(( const char *new_text ));
 
 /* True if a string is all lower case. */
 extern int all_lower PROTO((register char *));
@@ -899,7 +901,7 @@
 /* Return a printable version of the given character, which might be
  * 8-bit.
  */
-extern char *readable_form PROTO((int));
+extern const char *readable_form PROTO((int));
 
 /* Write out one section of the skeleton file. */
 extern void skelout PROTO((void));
@@ -962,23 +964,23 @@
 extern void build_eof_action PROTO((void));
 
 /* Write out a message formatted with one string, pinpointing its location. */
-extern void format_pinpoint_message PROTO((char[], char[]));
+extern void format_pinpoint_message PROTO((const char[], const char[]));
 
 /* Write out a message, pinpointing its location. */
-extern void pinpoint_message PROTO((char[]));
+extern void pinpoint_message PROTO((const char[]));
 
 /* Write out a warning, pinpointing it at the given line. */
-extern void line_warning PROTO(( char[], int ));
+extern void line_warning PROTO(( const char[], int ));
 
 /* Write out a message, pinpointing it at the given line. */
-extern void line_pinpoint PROTO(( char[], int ));
+extern void line_pinpoint PROTO(( const char[], int ));
 
 /* Report a formatted syntax error. */
-extern void format_synerr PROTO((char [], char[]));
-extern void synerr PROTO((char []));	/* report a syntax error */
-extern void format_warn PROTO((char [], char[]));
-extern void warn PROTO((char []));	/* report a warning */
-extern void yyerror PROTO((char []));	/* report a parse error */
+extern void format_synerr PROTO((const char [], char[]));
+extern void synerr PROTO((const char []));	/* report a syntax error */
+extern void format_warn PROTO((const char [], char[]));
+extern void warn PROTO((const char []));	/* report a warning */
+extern void yyerror PROTO((const char []));	/* report a parse error */
 extern int yyparse PROTO((void));	/* the YACC parser */
 
 
@@ -1013,7 +1015,7 @@
 
 /* Increase maximum number of SC's. */
 extern void scextend PROTO((void));
-extern void scinstal PROTO((char[], int));	/* make a start condition */
+extern void scinstal PROTO((const char[], int));	/* make a start condition */
 
 /* Lookup the number associated with a start condition. */
 extern int sclookup PROTO((char[]));
Index: lex/gen.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/gen.c,v
retrieving revision 1.5
diff -u -d -r1.5 gen.c
--- lex/gen.c	27 Oct 1999 07:56:44 -0000	1.5
+++ lex/gen.c	12 Sep 2001 16:21:07 -0000
@@ -36,8 +36,8 @@
 
 void gen_next_state PROTO((int));
 void genecs PROTO((void));
-void indent_put2s PROTO((char [], char []));
-void indent_puts PROTO((char []));
+void indent_put2s PROTO((const char [], const char []));
+void indent_puts PROTO((const char []));
 
 
 static int indent_level = 0; /* each level is 8 spaces */
@@ -492,11 +492,11 @@
 	/* NOTE - changes in here should be reflected in gen_next_state() and
 	 * gen_NUL_trans().
 	 */
-	char *char_map = useecs ?
+	const char *char_map = useecs ?
 				"yy_ec[YY_SC_TO_UI(*yy_cp)]" :
 				"YY_SC_TO_UI(*yy_cp)";
 
-	char *char_map_2 = useecs ?
+	const char *char_map_2 = useecs ?
 				"yy_ec[YY_SC_TO_UI(*++yy_cp)]" :
 				"YY_SC_TO_UI(*++yy_cp)";
 
@@ -1032,7 +1032,7 @@
  */
 
 void indent_put2s( fmt, arg )
-char fmt[], arg[];
+const char fmt[], arg[];
 	{
 	do_indent();
 	out_str( fmt, arg );
@@ -1045,7 +1045,7 @@
  */
 
 void indent_puts( str )
-char str[];
+const char str[];
 	{
 	do_indent();
 	outn( str );
@@ -1121,7 +1121,7 @@
 		 * enough to hold the biggest offset.
 		 */
 		int total_table_size = tblend + numecs + 1;
-		char *trans_offset_type =
+		const char *trans_offset_type =
 			(total_table_size >= MAX_SHORT || long_align) ?
 				"long" : "short";
 
Index: lex/main.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/main.c,v
retrieving revision 1.7
diff -u -d -r1.7 main.c
--- lex/main.c	27 Oct 1999 07:56:45 -0000	1.7
+++ lex/main.c	12 Sep 2001 16:41:36 -0000
@@ -65,9 +65,10 @@
 int skel_ind = 0;
 char *action_array;
 int action_size, defs1_offset, prolog_offset, action_offset, action_index;
-char *infilename = NULL, *outfilename = NULL;
+char *infilename = NULL;
+const char *outfilename = NULL;
 int did_outfilename;
-char *prefix, *yyclass;
+const char *prefix, *yyclass;
 int do_stdinit, use_stdout;
 int onestate[ONE_STACK_SIZE], onesym[ONE_STACK_SIZE];
 int onenext[ONE_STACK_SIZE], onedef[ONE_STACK_SIZE], onesp;
@@ -107,14 +108,14 @@
 /* Make sure program_name is initialized so we don't crash if writing
  * out an error message before getting the program name from argv[0].
  */
-char *program_name = "flex";
+const char *program_name = "flex";
 
 #ifndef SHORT_FILE_NAMES
-static char *outfile_template = "lex.%s.%s";
-static char *backing_name = "lex.backup";
+static const char *outfile_template = "lex.%s.%s";
+static const char *backing_name = "lex.backup";
 #else
-static char *outfile_template = "lex%s.%s";
-static char *backing_name = "lex.bck";
+static const char *outfile_template = "lex%s.%s";
+static const char *backing_name = "lex.bck";
 #endif
 
 #ifdef THINK_C
@@ -127,7 +128,7 @@
 
 static char outfile_path[MAXLINE];
 static int outfile_created = 0;
-static char *skelname = NULL;
+static const char *skelname = NULL;
 
 
 int main( argc, argv )
@@ -278,7 +279,7 @@
 
 		if ( ! did_outfilename )
 			{
-			char *suffix;
+			const char *suffix;
 
 			if ( C_plus_plus )
 				suffix = "cc";
@@ -354,7 +355,6 @@
 
 	{
 	int tblsiz;
-	int unlink();
 
 	if ( skelfile != NULL )
 		{
@@ -586,7 +586,7 @@
 char **argv;
 	{
 	int i, sawcmpflag;
-	char *arg;
+	const char *arg;
 
 	printstats = syntaxerror = trace = spprdflt = caseins = false;
 	lex_compat = C_plus_plus = backing_up_report = ddebug = fulltbl = false;
Index: lex/misc.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/misc.c,v
retrieving revision 1.5
diff -u -d -r1.5 misc.c
--- lex/misc.c	27 Oct 1999 07:56:45 -0000	1.5
+++ lex/misc.c	12 Sep 2001 16:35:34 -0000
@@ -33,7 +33,7 @@
 
 
 void action_define( defname, value )
-char *defname;
+const char *defname;
 int value;
 	{
 	char buf[MAXLINE];
@@ -51,7 +51,7 @@
 
 
 void add_action( new_text )
-char *new_text;
+const char *new_text;
 	{
 	int len = strlen( new_text );
 
@@ -387,7 +387,8 @@
 int do_infile;
 	{
 	char directive[MAXLINE], filename[MAXLINE];
-	char *s1, *s2, *s3;
+	const char *s1;
+	char *s2, *s3;
 	static char line_fmt[] = "#line %d \"%s\"\n";
 
 	if ( ! gen_line_dirs )
@@ -711,7 +712,7 @@
  * The returned string is in static storage.
  */
 
-char *readable_form( c )
+const char *readable_form( c )
 register int c;
 	{
 	static char rform[10];
@@ -778,15 +779,15 @@
 void skelout()
 	{
 	char buf_storage[MAXLINE];
-	char *buf = buf_storage;
+	const char *buf = buf_storage;
 	int do_copy = 1;
 
 	/* Loop pulling lines either from the skelfile, if we're using
 	 * one, or from the skel[] array.
 	 */
 	while ( skelfile ?
-		(fgets( buf, MAXLINE, skelfile ) != NULL) :
-		((buf = (char *) skel[skel_ind++]) != 0) )
+		(fgets( buf_storage, MAXLINE, skelfile ) != NULL) :
+		((buf = skel[skel_ind++]) != 0) )
 		{ /* copy from skel array */
 		if ( buf[0] == '%' )
 			{ /* control line */
Index: lex/nfa.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/nfa.c,v
retrieving revision 1.5
diff -u -d -r1.5 nfa.c
--- lex/nfa.c	27 Oct 1999 07:56:46 -0000	1.5
+++ lex/nfa.c	12 Sep 2001 16:36:09 -0000
@@ -238,8 +238,8 @@
 			/* Do trailing context magic to not match the trailing
 			 * characters.
 			 */
-			char *scanner_cp = "yy_c_buf_p = yy_cp";
-			char *scanner_bp = "yy_bp";
+			const char *scanner_cp = "yy_c_buf_p = yy_cp";
+			const char *scanner_bp = "yy_bp";
 
 			add_action(
 	"*yy_cp = yy_hold_char; /* undo effects of setting up yytext */\n" );
Index: lex/parse.y
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/parse.y,v
retrieving revision 1.3
diff -u -d -r1.3 parse.y
--- lex/parse.y	27 Oct 1999 07:56:46 -0000	1.3
+++ lex/parse.y	12 Sep 2001 16:55:30 -0000
@@ -78,7 +78,7 @@
 /* Bletch, ^^^^ that was ugly! */
 
 
-int pat, scnum, eps, headcnt, trailcnt, anyccl, lastchar, i, rulelen;
+int pat, scnum, eps, headcnt, trailcnt, anyccl, lastchar, __i, rulelen;
 int trlcontxt, xcluflg, currccl, cclsorted, varlength, variable_trail_rule;
 
 int *scon_stk;
@@ -126,8 +126,8 @@
 
 			finish_rule( def_rule, false, 0, 0 );
 
-			for ( i = 1; i <= lastsc; ++i )
-				scset[i] = mkbranch( scset[i], def_rule );
+			for ( __i = 1; __i <= lastsc; ++__i )
+				scset[__i] = mkbranch( scset[__i], def_rule );
 
 			if ( spprdflt )
 				add_action(
@@ -225,9 +225,9 @@
 
 			if ( scon_stk_ptr > 0 )
 				{
-				for ( i = 1; i <= scon_stk_ptr; ++i )
-					scbol[scon_stk[i]] =
-						mkbranch( scbol[scon_stk[i]],
+				for ( __i = 1; __i <= scon_stk_ptr; ++__i )
+					scbol[scon_stk[__i]] =
+						mkbranch( scbol[scon_stk[__i]],
 								pat );
 				}
 
@@ -237,9 +237,9 @@
 				 * including the default (0) start condition.
 				 */
 
-				for ( i = 1; i <= lastsc; ++i )
-					if ( ! scxclu[i] )
-						scbol[i] = mkbranch( scbol[i],
+				for ( __i = 1; __i <= lastsc; ++__i )
+					if ( ! scxclu[__i] )
+						scbol[__i] = mkbranch( scbol[__i],
 									pat );
 				}
 
@@ -261,18 +261,18 @@
 
 			if ( scon_stk_ptr > 0 )
 				{
-				for ( i = 1; i <= scon_stk_ptr; ++i )
-					scset[scon_stk[i]] =
-						mkbranch( scset[scon_stk[i]],
+				for ( __i = 1; __i <= scon_stk_ptr; ++__i )
+					scset[scon_stk[__i]] =
+						mkbranch( scset[scon_stk[__i]],
 								pat );
 				}
 
 			else
 				{
-				for ( i = 1; i <= lastsc; ++i )
-					if ( ! scxclu[i] )
-						scset[i] =
-							mkbranch( scset[i],
+				for ( __i = 1; __i <= lastsc; ++__i )
+					if ( ! scxclu[__i] )
+						scset[__i] =
+							mkbranch( scset[__i],
 								pat );
 				}
 			}
@@ -287,9 +287,9 @@
 				/* This EOF applies to all start conditions
 				 * which don't already have EOF actions.
 				 */
-				for ( i = 1; i <= lastsc; ++i )
-					if ( ! sceof[i] )
-						scon_stk[++scon_stk_ptr] = i;
+				for ( __i = 1; __i <= lastsc; ++__i )
+					if ( ! sceof[__i] )
+						scon_stk[++scon_stk_ptr] = __i;
 
 				if ( scon_stk_ptr == 0 )
 					warn(
@@ -315,16 +315,16 @@
 			{
 			$$ = scon_stk_ptr;
 
-			for ( i = 1; i <= lastsc; ++i )
+			for ( __i = 1; __i <= lastsc; ++__i )
 				{
 				int j;
 
 				for ( j = 1; j <= scon_stk_ptr; ++j )
-					if ( scon_stk[j] == i )
+					if ( scon_stk[j] == __i )
 						break;
 
 				if ( j > scon_stk_ptr )
-					scon_stk[++scon_stk_ptr] = i;
+					scon_stk[++scon_stk_ptr] = __i;
 				}
 			}
 
@@ -348,8 +348,8 @@
 					nmstr );
 			else
 				{
-				for ( i = 1; i <= scon_stk_ptr; ++i )
-					if ( scon_stk[i] == scnum )
+				for ( __i = 1; __i <= scon_stk_ptr; ++__i )
+					if ( scon_stk[__i] == scnum )
 						{
 						format_warn(
 							"<%s> specified twice",
@@ -357,7 +357,7 @@
 						break;
 						}
 
-				if ( i > scon_stk_ptr )
+				if ( __i > scon_stk_ptr )
 					scon_stk[++scon_stk_ptr] = scnum;
 				}
 			}
@@ -701,8 +701,8 @@
 
 			else
 				{
-				for ( i = $2; i <= $4; ++i )
-					ccladd( $1, i );
+				for ( __i = $2; __i <= $4; ++__i )
+					ccladd( $1, __i );
 
 				/* Keep track if this ccl is staying in
 				 * alphabetical order.
@@ -816,7 +816,8 @@
 /* format_synerr - write out formatted syntax error */
 
 void format_synerr( msg, arg )
-char msg[], arg[];
+const char msg[];
+char arg[];
 	{
 	char errmsg[MAXLINE];
 
@@ -828,7 +829,7 @@
 /* synerr - report a syntax error */
 
 void synerr( str )
-char str[];
+const char str[];
 	{
 	syntaxerror = true;
 	pinpoint_message( str );
@@ -838,7 +839,8 @@
 /* format_warn - write out formatted warning */
 
 void format_warn( msg, arg )
-char msg[], arg[];
+const char msg[];
+char arg[];
 	{
 	char warn_msg[MAXLINE];
 
@@ -850,7 +852,7 @@
 /* warn - report a warning, unless -w was given */
 
 void warn( str )
-char str[];
+const char str[];
 	{
 	line_warning( str, linenum );
 	}
@@ -860,7 +862,7 @@
  */
 
 void format_pinpoint_message( msg, arg )
-char msg[], arg[];
+const char msg[], arg[];
 	{
 	char errmsg[MAXLINE];
 
@@ -872,7 +874,7 @@
 /* pinpoint_message - write out a message, pinpointing its location */
 
 void pinpoint_message( str )
-char str[];
+const char str[];
 	{
 	line_pinpoint( str, linenum );
 	}
@@ -881,7 +883,7 @@
 /* line_warning - report a warning at a given line, unless -w was given */
 
 void line_warning( str, line )
-char str[];
+const char str[];
 int line;
 	{
 	char warning[MAXLINE];
@@ -897,7 +899,7 @@
 /* line_pinpoint - write out a message, pinpointing it at the given line */
 
 void line_pinpoint( str, line )
-char str[];
+const char str[];
 int line;
 	{
 	fprintf( stderr, "\"%s\", line %d: %s\n", infilename, line, str );
@@ -909,6 +911,6 @@
  */
 
 void yyerror( msg )
-char msg[];
+const char msg[] __unused;
 	{
 	}
Index: lex/scan.l
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/scan.l,v
retrieving revision 1.5
diff -u -d -r1.5 scan.l
--- lex/scan.l	27 Oct 1999 07:56:46 -0000	1.5
+++ lex/scan.l	12 Sep 2001 16:38:47 -0000
@@ -99,7 +99,7 @@
 
 	int doing_codeblock = false;
 	int i;
-	Char nmdef[MAXLINE], myesc();
+	Char nmdef[MAXLINE];
 
 
 <INITIAL>{
@@ -160,7 +160,7 @@
 	[[:digit:]]+	linenum = myctoi( yytext );
 
 	\"[^"\n]*\"	{
-			flex_free( (void *) infilename );
+			flex_free( infilename );
 			infilename = copy_string( yytext + 1 );
 			infilename[strlen( infilename ) - 1] = '\0';
 			}
@@ -435,7 +435,6 @@
 
 	"{"{NAME}"}"	{
 			register Char *nmdefptr;
-			Char *ndlookup();
 
 			strcpy( nmstr, yytext + 1 );
 			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
Index: lex/sym.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/sym.c,v
retrieving revision 1.5
diff -u -d -r1.5 sym.c
--- lex/sym.c	27 Oct 1999 07:56:47 -0000	1.5
+++ lex/sym.c	12 Sep 2001 17:00:38 -0000
@@ -41,7 +41,7 @@
 struct hash_entry *sctbl[START_COND_HASH_SIZE];
 struct hash_entry *ccltab[CCL_HASH_SIZE];
 
-struct hash_entry *findsym();
+struct hash_entry *findsym(char[], hash_table, int);
 
 
 /* addsym - add symbol and definitions to symbol table
@@ -106,8 +106,6 @@
 	/* We don't bother checking the return status because we are not
 	 * called unless the symbol is new.
 	 */
-	Char *copy_unsigned_string();
-
 	(void) addsym( (char *) copy_unsigned_string( ccltxt ),
 			(char *) 0, cclnum,
 			ccltab, CCL_HASH_SIZE );
@@ -180,9 +178,6 @@
 char name[];
 Char definition[];
 	{
-	char *copy_string();
-	Char *copy_unsigned_string();
-
 	if ( addsym( copy_string( name ),
 			(char *) copy_unsigned_string( definition ), 0,
 			ndtbl, NAME_TABLE_HASH_SIZE ) )
@@ -225,11 +220,9 @@
  */
 
 void scinstal( str, xcluflg )
-char str[];
+const char str[];
 int xcluflg;
 	{
-	char *copy_string();
-
 	/* Generate start condition definition, for use in BEGIN et al. */
 	action_define( str, lastsc );
 
Index: lex/tblcmp.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/tblcmp.c,v
retrieving revision 1.5
diff -u -d -r1.5 tblcmp.c
--- lex/tblcmp.c	27 Oct 1999 07:56:47 -0000	1.5
+++ lex/tblcmp.c	12 Sep 2001 17:01:31 -0000
@@ -643,8 +643,8 @@
  *            has only one out-transition
  */
 
-void mk1tbl( state, sym, onenxt, onedef )
-int state, sym, onenxt, onedef;
+void mk1tbl( state, sym, onenxt, onedf )
+int state, sym, onenxt, onedf;
 	{
 	if ( firstfree < sym )
 		firstfree = sym;
@@ -654,7 +654,7 @@
 			expand_nxt_chk();
 
 	base[state] = firstfree - sym;
-	def[state] = onedef;
+	def[state] = onedf;
 	chk[firstfree] = state;
 	nxt[firstfree] = onenxt;
 
Index: lex/lib/libmain.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/lib/libmain.c,v
retrieving revision 1.3
diff -u -d -r1.3 libmain.c
--- lex/lib/libmain.c	27 Oct 1999 07:56:49 -0000	1.3
+++ lex/lib/libmain.c	12 Sep 2001 15:29:32 -0000
@@ -3,14 +3,14 @@
 /* $Header: /home/daffy/u0/vern/flex/RCS/libmain.c,v 1.4 95/09/27 12:47:55 vern Exp $
  * $FreeBSD: src/usr.bin/lex/lib/libmain.c,v 1.3 1999/10/27 07:56:49 obrien Exp $ */
 
-extern int yylex();
+#include <sys/cdefs.h>
 
-int main( argc, argv )
-int argc;
-char *argv[];
-	{
-	while ( yylex() != 0 )
-		;
+extern int yylex(void);
+
+int
+main(int argc __unused, char *argv[] __unused)
+{
+	while (yylex() != 0);
 
 	return 0;
-	}
+}
Index: lex/lib/libyywrap.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/lex/lib/libyywrap.c,v
retrieving revision 1.4
diff -u -d -r1.4 libyywrap.c
--- lex/lib/libyywrap.c	27 Oct 1999 07:56:49 -0000	1.4
+++ lex/lib/libyywrap.c	12 Sep 2001 15:31:41 -0000
@@ -3,7 +3,10 @@
 /* $Header: /home/daffy/u0/vern/flex/RCS/libyywrap.c,v 1.1 93/10/02 15:23:09 vern Exp $
  * $FreeBSD: src/usr.bin/lex/lib/libyywrap.c,v 1.4 1999/10/27 07:56:49 obrien Exp $ */
 
-int yywrap()
-	{
+int yywrap(void);
+
+int
+yywrap(void)
+{
 	return 1;
-	}
+}
Index: yacc/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/Makefile,v
retrieving revision 1.10
diff -u -d -r1.10 Makefile
--- yacc/Makefile	7 Apr 2001 11:21:26 -0000	1.10
+++ yacc/Makefile	12 Sep 2001 14:20:53 -0000
@@ -8,5 +8,6 @@
 MAN=	yacc.1 yyfix.1
 LINKS=	${BINDIR}/yacc ${BINDIR}/byacc
 MLINKS=	yacc.1 byacc.1
+WARNS?=	2
 
 .include <bsd.prog.mk>
Index: yacc/defs.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/defs.h,v
retrieving revision 1.9
diff -u -d -r1.9 defs.h
--- yacc/defs.h	26 Nov 2000 11:07:45 -0000	1.9
+++ yacc/defs.h	12 Sep 2001 14:55:14 -0000
@@ -225,7 +225,7 @@
 extern char rflag;
 extern char tflag;
 extern char vflag;
-extern char *symbol_prefix;
+extern const char *symbol_prefix;
 
 extern char *myname;
 extern char *cptr;
@@ -233,16 +233,16 @@
 extern int lineno;
 extern int outline;
 
-extern char *banner[];
-extern char *tables[];
-extern char *header[];
-extern char *body[];
-extern char *trailer[];
+extern const char *banner[];
+extern const char *tables[];
+extern const char *header[];
+extern const char *body[];
+extern const char *trailer[];
 
 extern char *action_file_name;
 extern char *code_file_name;
 extern char *defines_file_name;
-extern char *input_file_name;
+extern const char *input_file_name;
 extern char *output_file_name;
 extern char *text_file_name;
 extern char *union_file_name;
@@ -319,7 +319,7 @@
 void dollar_error __P((int, char *, char *));
 void dollar_warning __P((int, int));
 void done __P((int));
-void fatal __P((char *msg));
+void fatal __P((const char *msg));
 void finalize_closure __P((void));
 void free_parser __P((void));
 void free_symbols __P((void));
@@ -329,11 +329,11 @@
 void lalr __P((void));
 bucket *lookup __P((char *));
 void lr0 __P((void));
-bucket *make_bucket __P((char *));
+bucket *make_bucket __P((const char *));
 void make_parser __P((void));
 void no_grammar __P((void));
 void no_space __P((void));
-void open_error __P((char *));
+void open_error __P((const char *));
 void output __P((void));
 void over_unionized __P((char *));
 void prec_redeclared __P((void));
@@ -361,4 +361,4 @@
 void untyped_rhs __P((int, char *));
 void used_reserved __P((char *));
 void verbose __P((void));
-void write_section __P((char **));
+void write_section __P((const char **));
Index: yacc/error.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/error.c,v
retrieving revision 1.7
diff -u -d -r1.7 error.c
--- yacc/error.c	28 Aug 1999 01:07:59 -0000	1.7
+++ yacc/error.c	12 Sep 2001 14:33:23 -0000
@@ -50,7 +50,7 @@
 
 void
 fatal(msg)
-char *msg;
+const char *msg;
 {
     warnx("f - %s", msg);
     done(2);
@@ -67,7 +67,7 @@
 
 void
 open_error(filename)
-char *filename;
+const char *filename;
 {
     warnx("f - cannot open \"%s\"", filename);
     done(2);
Index: yacc/lalr.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/lalr.c,v
retrieving revision 1.7
diff -u -d -r1.7 lalr.c
--- yacc/lalr.c	28 Aug 1999 01:07:59 -0000	1.7
+++ yacc/lalr.c	12 Sep 2001 14:26:19 -0000
@@ -415,7 +415,7 @@
   register shifts *sp;
   register int length;
   register int nedges;
-  register int done;
+  register int isdone;
   register int state1;
   register int stateno;
   register int symbol1;
@@ -459,16 +459,16 @@
 	  add_lookback_edge(stateno, *rulep, i);
 
 	  length--;
-	  done = 0;
-	  while (!done)
+	  isdone = 0;
+	  while (!isdone)
 	    {
-	      done = 1;
+	      isdone = 1;
 	      rp--;
 	      if (ISVAR(*rp))
 		{
 		  stateno = states[--length];
 		  edge[nedges++] = map_goto(stateno, *rp);
-		  if (nullable[*rp] && length > 0) done = 0;
+		  if (nullable[*rp] && length > 0) isdone = 0;
 		}
 	    }
 	}
@@ -526,12 +526,12 @@
 
 
 static short **
-transpose(R, n)
-short **R;
+transpose(r, n)
+short **r;
 int n;
 {
-  register short **new_R;
-  register short **temp_R;
+  register short **new_r;
+  register short **temp_r;
   register short *nedges;
   register short *sp;
   register int i;
@@ -541,7 +541,7 @@
 
   for (i = 0; i < n; i++)
     {
-      sp = R[i];
+      sp = r[i];
       if (sp)
 	{
 	  while (*sp >= 0)
@@ -549,8 +549,8 @@
 	}
     }
 
-  new_R = NEW2(n, short *);
-  temp_R = NEW2(n, short *);
+  new_r = NEW2(n, short *);
+  temp_r = NEW2(n, short *);
 
   for (i = 0; i < n; i++)
     {
@@ -558,8 +558,8 @@
       if (k > 0)
 	{
 	  sp = NEW2(k + 1, short);
-	  new_R[i] = sp;
-	  temp_R[i] = sp;
+	  new_r[i] = sp;
+	  temp_r[i] = sp;
 	  sp[k] = -1;
 	}
     }
@@ -568,17 +568,17 @@
 
   for (i = 0; i < n; i++)
     {
-      sp = R[i];
+      sp = r[i];
       if (sp)
 	{
 	  while (*sp >= 0)
-	    *temp_R[*sp++]++ = i;
+	    *temp_r[*sp++]++ = i;
 	}
     }
 
-  FREE(temp_R);
+  FREE(temp_r);
 
-  return (new_R);
+  return (new_r);
 }
 
 
Index: yacc/lr0.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/lr0.c,v
retrieving revision 1.6
diff -u -d -r1.6 lr0.c
--- yacc/lr0.c	28 Aug 1999 01:08:00 -0000	1.6
+++ yacc/lr0.c	12 Sep 2001 14:28:04 -0000
@@ -611,7 +611,7 @@
 {
     register int i, j;
     register int empty;
-    int done;
+    int isdone;
 
     nullable = MALLOC(nsyms);
     if (nullable == 0) no_space();
@@ -619,10 +619,10 @@
     for (i = 0; i < nsyms; ++i)
 	nullable[i] = 0;
 
-    done = 0;
-    while (!done)
+    isdone = 0;
+    while (!isdone)
     {
-	done = 1;
+	isdone = 1;
 	for (i = 1; i < nitems; i++)
 	{
 	    empty = 1;
@@ -638,7 +638,7 @@
 		if (!nullable[j])
 		{
 		    nullable[j] = 1;
-		    done = 0;
+		    isdone = 0;
 		}
 	    }
 	}
Index: yacc/main.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/main.c,v
retrieving revision 1.12
diff -u -d -r1.12 main.c
--- yacc/main.c	10 Jan 2000 20:26:24 -0000	1.12
+++ yacc/main.c	12 Sep 2001 14:40:50 -0000
@@ -60,9 +60,9 @@
 char tflag;
 char vflag;
 
-char *symbol_prefix;
-char *file_prefix = "y";
-char *temp_form = "yacc.XXXXXXXXXXX";
+const char *symbol_prefix;
+const char *file_prefix = "y";
+const char *temp_form = "yacc.XXXXXXXXXXX";
 
 int lineno;
 int outline;
@@ -70,7 +70,7 @@
 char *action_file_name;
 char *code_file_name;
 char *defines_file_name;
-char *input_file_name = "";
+const char *input_file_name = "";
 char *output_file_name;
 char *text_file_name;
 char *union_file_name;
@@ -130,7 +130,7 @@
 
 static void
 onintr(signo)
-	int signo;
+	int signo __unused;
 {
     done(1);
 }
@@ -298,7 +298,7 @@
 create_file_names()
 {
     int i, len;
-    char *tmpdir;
+    const char *tmpdir;
 
     tmpdir = getenv("TMPDIR");
     if (tmpdir == 0) tmpdir = "/tmp";
Index: yacc/mkpar.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/mkpar.c,v
retrieving revision 1.10
diff -u -d -r1.10 mkpar.c
--- yacc/mkpar.c	28 Aug 1999 01:08:01 -0000	1.10
+++ yacc/mkpar.c	12 Sep 2001 14:39:00 -0000
@@ -107,7 +107,7 @@
 {
     register action *actions, *temp;
     register shifts *sp;
-    register short *to_state;
+    register short *tostate;
     register int i, k;
     register int symbol;
 
@@ -115,10 +115,10 @@
     sp = shift_table[stateno];
     if (sp)
     {
-	to_state = sp->shift;
+	tostate = sp->shift;
 	for (i = sp->nshifts - 1; i >= 0; i--)
 	{
-	    k = to_state[i];
+	    k = tostate[i];
 	    symbol = accessing_symbol[k];
 	    if (ISTOKEN(symbol))
 	    {
@@ -207,15 +207,15 @@
 find_final_state()
 {
     register int goal, i;
-    register short *to_state;
+    register short *tostate;
     register shifts *p;
 
     p = shift_table[0];
-    to_state = p->shift;
+    tostate = p->shift;
     goal = ritem[1];
     for (i = p->nshifts - 1; i >= 0; --i)
     {
-	final_state = to_state[i];
+	final_state = tostate[i];
 	if (accessing_symbol[final_state] == goal) break;
     }
 }
Index: yacc/output.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/output.c,v
retrieving revision 1.15
diff -u -d -r1.15 output.c
--- yacc/output.c	26 Nov 2000 11:07:45 -0000	1.15
+++ yacc/output.c	12 Sep 2001 14:45:30 -0000
@@ -954,6 +954,7 @@
 {
     register int i, j, k, max;
     char **symnam, *s;
+    static char eof[]="end-of-file";
 
     ++outline;
     fprintf(code_file, "#define YYFINAL %d\n", final_state);
@@ -980,7 +981,7 @@
 	symnam[i] = 0;
     for (i = ntokens - 1; i >= 2; --i)
 	symnam[symbol_value[i]] = symbol_name[i];
-    symnam[0] = "end-of-file";
+    symnam[0] = eof;
 
     if (!rflag) ++outline;
     fprintf(output_file, "#if YYDEBUG\n");
Index: yacc/reader.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/reader.c,v
retrieving revision 1.9
diff -u -d -r1.9 reader.c
--- yacc/reader.c	26 Nov 2000 11:07:45 -0000	1.9
+++ yacc/reader.c	12 Sep 2001 14:48:42 -0000
@@ -113,6 +113,7 @@
 static void read_grammar __P((void));
 static void skip_comment __P((void));
 static void start_rule __P((bucket *, int));
+static void declare_expect __P((int));
 
 static void
 cachec(c)
@@ -1818,7 +1819,7 @@
 pack_grammar()
 {
     register int i, j;
-    int assoc, prec;
+    int assoc, pre;
 
     ritem = (short *) MALLOC(nitems*sizeof(short));
     if (ritem == 0) no_space();
@@ -1848,13 +1849,13 @@
 	rlhs[i] = plhs[i]->index;
 	rrhs[i] = j;
 	assoc = TOKEN;
-	prec = 0;
+	pre = 0;
 	while (pitem[j])
 	{
 	    ritem[j] = pitem[j]->index;
 	    if (pitem[j]->class == TERM)
 	    {
-		prec = pitem[j]->prec;
+		pre = pitem[j]->prec;
 		assoc = pitem[j]->assoc;
 	    }
 	    ++j;
@@ -1863,7 +1864,7 @@
 	++j;
 	if (rprec[i] == UNDEFINED)
 	{
-	    rprec[i] = prec;
+	    rprec[i] = pre;
 	    rassoc[i] = assoc;
 	}
     }
Index: yacc/skeleton.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/skeleton.c,v
retrieving revision 1.29
diff -u -d -r1.29 skeleton.c
--- yacc/skeleton.c	19 Feb 2001 01:10:01 -0000	1.29
+++ yacc/skeleton.c	12 Sep 2001 15:47:52 -0000
@@ -52,7 +52,7 @@
 /*  the body either are not useful outside of semantic actions or	*/
 /*  are conditional.							*/
 
-char *banner[] =
+const char *banner[] =
 {
     "#ifndef lint",
     "static char const ",
@@ -76,7 +76,7 @@
 };
 
 
-char *tables[] =
+const char *tables[] =
 {
     "extern const short yylhs[];",
     "extern const short yylen[];",
@@ -95,7 +95,7 @@
 };
 
 
-char *header[] =
+const char *header[] =
 {
     "#if YYDEBUG",
     "#include <stdio.h>",
@@ -128,10 +128,10 @@
 };
 
 
-char *body[] =
+const char *body[] =
 {
     "/* allocate initial stack or double stack size, up to YYMAXDEPTH */",
-    "static int yygrowstack()",
+    "static int yygrowstack(void)",
     "{",
     "    int newsize, i;",
     "    short *newss;",
@@ -330,7 +330,7 @@
 };
 
 
-char *trailer[] =
+const char *trailer[] =
 {
     "    }",
     "    yyssp -= yym;",
@@ -394,11 +394,11 @@
 
 void
 write_section(section)
-char *section[];
+const char *section[];
 {
     register int c;
     register int i;
-    register char *s;
+    register const char *s;
     register FILE *f;
 
     f = code_file;
Index: yacc/symtab.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/symtab.c,v
retrieving revision 1.6
diff -u -d -r1.6 symtab.c
--- yacc/symtab.c	28 Aug 1999 01:08:03 -0000	1.6
+++ yacc/symtab.c	12 Sep 2001 14:56:37 -0000
@@ -49,7 +49,7 @@
 
 #define	TABLE_SIZE 1024
 
-static int hash __P((char *));
+static int hash __P((const char *));
 
 bucket **symbol_table;
 bucket *first_symbol;
@@ -58,9 +58,9 @@
 
 static int
 hash(name)
-char *name;
+const char *name;
 {
-    register char *s;
+    register const char *s;
     register int c, k;
 
     assert(name && *name);
@@ -75,7 +75,7 @@
 
 bucket *
 make_bucket(name)
-char *name;
+const char *name;
 {
     register bucket *bp;
 
Index: yacc/verbose.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/yacc/verbose.c,v
retrieving revision 1.6
diff -u -d -r1.6 verbose.c
--- yacc/verbose.c	28 Aug 1999 01:08:03 -0000	1.6
+++ yacc/verbose.c	12 Sep 2001 14:59:22 -0000
@@ -331,9 +331,9 @@
 
 
 static void
-print_reductions(p, defred)
+print_reductions(p, def)
 register action *p;
-register int defred;
+register int def;
 {
     register int k, anyreds;
     register action *q;
@@ -354,7 +354,7 @@
     {
 	for (; p; p = p->next)
 	{
-	    if (p->action_code == REDUCE && p->number != defred)
+	    if (p->action_code == REDUCE && p->number != def)
 	    {
 		k = p->number - 2;
 		if (p->suppressed == 0)
@@ -363,8 +363,8 @@
 	    }
 	}
 
-        if (defred > 0)
-	    fprintf(verbose_file, "\t.  reduce %d\n", defred - 2);
+        if (def > 0)
+	    fprintf(verbose_file, "\t.  reduce %d\n", def - 2);
     }
 }
 
@@ -375,15 +375,15 @@
 {
     register int i, k;
     register int as;
-    register short *to_state;
+    register short *tostate;
     register shifts *sp;
 
     putc('\n', verbose_file);
     sp = shift_table[stateno];
-    to_state = sp->shift;
+    tostate = sp->shift;
     for (i = 0; i < sp->nshifts; ++i)
     {
-	k = to_state[i];
+	k = tostate[i];
 	as = accessing_symbol[k];
 	if (ISVAR(as))
 	    fprintf(verbose_file, "\t%s  goto %d\n", symbol_name[as], k);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-audit" in the body of the message