Module Name: src
Committed By: njoly
Date: Mon Dec 26 17:32:28 UTC 2011
Modified Files:
src/external/bsd/flex/dist: flex.skl main.c
Log Message:
Re-apply some lint comments that have been lost during move to
external tree.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/dist/flex.skl
diff -u src/external/bsd/flex/dist/flex.skl:1.6 src/external/bsd/flex/dist/flex.skl:1.7
--- src/external/bsd/flex/dist/flex.skl:1.6 Sat Aug 27 18:36:03 2011
+++ src/external/bsd/flex/dist/flex.skl Mon Dec 26 17:32:28 2011
@@ -1232,7 +1232,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
[[
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
]])
@@ -1320,7 +1320,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );
}
- while ( 1 ) /* loops until end-of-file is reached */
+ while (/*CONSTCOND*/ 1 ) /* loops until end-of-file is reached */
{
%% [8.0] yymore()-related code goes here
yy_cp = YY_G(yy_c_buf_p);
Index: src/external/bsd/flex/dist/main.c
diff -u src/external/bsd/flex/dist/main.c:1.2 src/external/bsd/flex/dist/main.c:1.3
--- src/external/bsd/flex/dist/main.c:1.2 Mon Oct 26 04:27:15 2009
+++ src/external/bsd/flex/dist/main.c Mon Dec 26 17:32:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: main.c,v 1.3 2011/12/26 17:32:28 njoly Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -1579,7 +1579,7 @@ void readin ()
if (!do_yywrap) {
if (!C_plus_plus) {
- outn ("\n#define yywrap(n) 1");
+ outn ("\n#define yywrap(n) (/*CONSTCOND*/1)");
}
outn ("#define YY_SKIP_YYWRAP");
}
