summaryrefslogtreecommitdiffstats
path: root/usr.bin/mkesdb
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2013-05-25 15:36:15 +0000
committered <ed@FreeBSD.org>2013-05-25 15:36:15 +0000
commit9b52f7b4ed3c8328148e0309a1940c05066ddf43 (patch)
tree21ab1e11459d9d731bd9b64200e223511a7c0464 /usr.bin/mkesdb
parent843b520e070189fc9edf7f90939fc984e2611572 (diff)
downloadFreeBSD-src-9b52f7b4ed3c8328148e0309a1940c05066ddf43.zip
FreeBSD-src-9b52f7b4ed3c8328148e0309a1940c05066ddf43.tar.gz
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.
Diffstat (limited to 'usr.bin/mkesdb')
-rw-r--r--usr.bin/mkesdb/ldef.h2
-rw-r--r--usr.bin/mkesdb/lex.l6
-rw-r--r--usr.bin/mkesdb/yacc.y2
3 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/mkesdb/ldef.h b/usr.bin/mkesdb/ldef.h
index 0c5e76a..45b4e60 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 3e852b0..19c5379 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 0c01b61..6d77b15 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);
}
OpenPOWER on IntegriCloud