diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2013-05-25 15:36:15 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2013-05-25 15:36:15 +0000 |
| commit | af8e44c84ab9d4144964b049e554ad1c322d983f (patch) | |
| tree | 21ab1e11459d9d731bd9b64200e223511a7c0464 | |
| parent | 0bbacb9c66160751fc1f2dfc81107d2be30b88c9 (diff) | |
| download | src-af8e44c84ab9d4144964b049e554ad1c322d983f.tar.gz src-af8e44c84ab9d4144964b049e554ad1c322d983f.zip | |
Prevent shadowing.
The name line_number seems to be used as a function parameter name for
one of the Lex functions. Change the name to linenumber.
Notes
Notes:
svn path=/head/; revision=250984
| -rw-r--r-- | usr.bin/mkcsmapper/ldef.h | 2 | ||||
| -rw-r--r-- | usr.bin/mkcsmapper/lex.l | 6 | ||||
| -rw-r--r-- | usr.bin/mkcsmapper/yacc.y | 2 | ||||
| -rw-r--r-- | usr.bin/mkesdb/ldef.h | 2 | ||||
| -rw-r--r-- | usr.bin/mkesdb/lex.l | 6 | ||||
| -rw-r--r-- | usr.bin/mkesdb/yacc.y | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/mkcsmapper/ldef.h b/usr.bin/mkcsmapper/ldef.h index 70c31225d9a9..d5857032d751 100644 --- a/usr.bin/mkcsmapper/ldef.h +++ b/usr.bin/mkcsmapper/ldef.h @@ -36,6 +36,6 @@ typedef struct { } linear_zone_t; extern int debug; -extern int line_number; +extern int linenumber; extern int yyerror(const char *); extern int yylex(void); diff --git a/usr.bin/mkcsmapper/lex.l b/usr.bin/mkcsmapper/lex.l index d8ab1b6b3018..4ba7fc4af045 100644 --- a/usr.bin/mkcsmapper/lex.l +++ b/usr.bin/mkcsmapper/lex.l @@ -41,7 +41,7 @@ #include "ldef.h" #include "yacc.h" -int line_number = 1; +int linenumber = 1; %} %option noinput %option nounput @@ -51,11 +51,11 @@ int line_number = 1; %% [ \t]+ { } -#.*[\n]|"//".*[\n]|[\n] { line_number++; return (R_LN); } +#.*[\n]|"//".*[\n]|[\n] { linenumber++; return (R_LN); } "/*" { BEGIN COMMENT; } <COMMENT>"*/" { BEGIN 0; } -<COMMENT>[\n] { line_number++; } +<COMMENT>[\n] { linenumber++; } <COMMENT>. { } <COMMENT><<EOF>> { yyerror("unexpected file end (unterminated comment)\n"); diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y index 5d1a06bfb8b5..18497cef1c3d 100644 --- a/usr.bin/mkcsmapper/yacc.y +++ b/usr.bin/mkcsmapper/yacc.y @@ -203,7 +203,7 @@ static void warning(const char *s) { - fprintf(stderr, "%s in %d\n", s, line_number); + fprintf(stderr, "%s in %d\n", s, linenumber); } int diff --git a/usr.bin/mkesdb/ldef.h b/usr.bin/mkesdb/ldef.h index 0c5e76a25b12..45b4e60cd709 100644 --- a/usr.bin/mkesdb/ldef.h +++ b/usr.bin/mkesdb/ldef.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -extern int line_number; +extern int linenumber; extern int yyerror(const char *); extern int yylex(void); diff --git a/usr.bin/mkesdb/lex.l b/usr.bin/mkesdb/lex.l index 3e852b099b81..19c5379b59d5 100644 --- a/usr.bin/mkesdb/lex.l +++ b/usr.bin/mkesdb/lex.l @@ -43,7 +43,7 @@ #include "ldef.h" #include "yacc.h" -int line_number = 1; +int linenumber = 1; %} %option noinput %option nounput @@ -53,11 +53,11 @@ int line_number = 1; %% [ \t]+ { } -#.*[\n]|"//".*[\n]|[\n] { line_number++; return (R_LN); } +#.*[\n]|"//".*[\n]|[\n] { linenumber++; return (R_LN); } "/*" { BEGIN COMMENT; } <COMMENT>"*/" { BEGIN 0; } -<COMMENT>[\n] { line_number++; } +<COMMENT>[\n] { linenumber++; } <COMMENT>. { } <COMMENT><<EOF>> { yyerror("unexpected file end (unterminated comment)\n"); diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y index 0c01b61f65c8..6d77b157f10c 100644 --- a/usr.bin/mkesdb/yacc.y +++ b/usr.bin/mkesdb/yacc.y @@ -114,7 +114,7 @@ int yyerror(const char *s) { - fprintf(stderr, "%s in %d\n", s, line_number); + fprintf(stderr, "%s in %d\n", s, linenumber); return (0); } |