Module Name:src
Committed By: lukem
Date: Tue Apr 14 09:41:31 UTC 2009
Modified Files:
src/usr.bin/yacc: defs.h error.c lalr.c lr0.c main.c mkpar.c output.c
reader.c symtab.c verbose.c
Log Message:
Fix WARNS=4 issues (-Wshadow -Wcast-qual)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/yacc/defs.h
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/yacc/error.c src/usr.bin/yacc/lalr.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/yacc/lr0.c src/usr.bin/yacc/verbose.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/yacc/main.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/yacc/mkpar.c src/usr.bin/yacc/symtab.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/yacc/output.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/yacc/reader.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/yacc/defs.h
diff -u src/usr.bin/yacc/defs.h:1.16 src/usr.bin/yacc/defs.h:1.17
--- src/usr.bin/yacc/defs.h:1.16 Sat Dec 15 22:01:25 2007
+++ src/usr.bin/yacc/defs.h Tue Apr 14 09:41:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.16 2007/12/15 22:01:25 perry Exp $ */
+/* $NetBSD: defs.h,v 1.17 2009/04/14 09:41:30 lukem Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -226,9 +226,9 @@
extern char rflag;
extern char tflag;
extern char vflag;
-extern char *symbol_prefix;
+extern const char *symbol_prefix;
-extern char *myname;
+extern const char *myname;
extern char *cptr;
extern char *line;
extern int lineno;
@@ -243,7 +243,7 @@
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;
@@ -314,19 +314,19 @@
extern char *allocate(unsigned);
extern bucket *lookup(char *);
-extern bucket *make_bucket(char *);
+extern bucket *make_bucket(const char *);
extern void set_first_derives(void);
extern void closure(short *, int);
extern void finalize_closure(void);
-extern __dead void fatal(char *);
+extern __dead void fatal(const char *);
extern void reflexive_transitive_closure(unsigned *, int);
extern __dead void done(int);
extern __dead void no_space(void);
-extern __dead void open_error(char *);
+extern __dead void open_error(const char *);
extern __dead void unexpected_EOF(void);
extern void print_pos(char *, char *);
extern __dead void syntax_error(int, char *, char *);
Index: src/usr.bin/yacc/error.c
diff -u src/usr.bin/yacc/error.c:1.10 src/usr.bin/yacc/error.c:1.11
--- src/usr.bin/yacc/error.c:1.10 Wed May 24 18:01:43 2006
+++ src/usr.bin/yacc/error.c Tue Apr 14 09:41:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: error.c,v 1.10 2006/05/24 18:01:43 christos Exp $ */
+/* $NetBSD: error.c,v 1.11 2009/04/14 09:41:30 lukem Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: error.c,v 1.10 2006/05/24 18:01:43 christos Exp $");
+__RCSID("$NetBSD: error.c,v 1.11 2009/04/14 09:41:30 lukem Exp $");
#endif
#endif /* not lint */
@@ -46,7 +46,7 @@
#include "defs.h"
__dead void
-fatal(char *msg)
+fatal(const char *msg)
{
fprintf(stderr, "%s: f - %s\n", myname, msg);
done(2);
@@ -61,7 +61,7 @@
}
__dead void
-open_error(char *filename)
+open_error(const char *filename)
{
fprintf(stderr, "%s: f - cannot open \"%s\"\n", myname, filename);
done(2);
Index: src/usr.bin/yacc/lalr.c
diff -u src/usr.bin/yacc/lalr.c:1.10 src/usr.bin/yacc/lalr.c:1.11
--- src/usr.bin/yacc/lalr.c:1.10 Wed May 24 18:06:58 2006
+++ src/usr.bin/yacc/lalr.c Tue Apr 14 09:41:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lalr.c,v 1.10 2006/05/24 18:06:58 christos Exp $ */
+/* $NetBSD: lalr.c,v 1.11 2009/04/14 09:41:30 lukem Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: lalr.c,v 1.10 2006/05/24 18:06:58 christos Exp $");
+__RCSID("$NetBSD: lalr.c,v 1.11 2009/04/14 09:41:30 lukem Exp $");
#endif
#endif /* not lint */
@@ -407,7 +407,7 @@
shifts *sp;
int length;
int nedges;
- int done;
+ int isdone;
int state1;
int stateno;
int symbol1;
@@ -451,16 +451,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;
}
}
}
@@ -517,7 +517,7 @@
static short **
-transpose(short **R, int n)
+transpose(short **tR, int n)
{
short **new_R;
short **temp_
