INN commit: branches (3 files)
INN Commit
rra at isc.org
Wed Jul 31 17:25:39 UTC 2013
Date: Wednesday, July 31, 2013 @ 10:25:38
Author: iulius
Revision: 9520
fix build with flex 2.5.36+
Cast yyget_leng() to size_t because it used to be an int
in flex versions anterior to 2.5.35 (not included).
Modified:
branches/2.5/ (properties)
branches/2.5/doc/pod/news.pod
branches/2.5/innfeed/configfile.l
----------------------+
doc/pod/news.pod | 5 +++++
innfeed/configfile.l | 21 ++++-----------------
2 files changed, 9 insertions(+), 17 deletions(-)
Property changes on: branches/2.5
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk:9501
Modified: 2.5/doc/pod/news.pod
===================================================================
--- 2.5/doc/pod/news.pod 2013-07-31 17:24:20 UTC (rev 9519)
+++ 2.5/doc/pod/news.pod 2013-07-31 17:25:38 UTC (rev 9520)
@@ -18,6 +18,11 @@
=item *
+INN now properly builds fine with S<< B<flex> 2.5.36 >> (this version
+introduced a change of type for a variable used by INN).
+
+=item *
+
When using funnel feeds, B<innfeed> log files were open forever, which
resulted in empty log files, once rotated by B<scanlogs>. B<innfeed>
now reopens its log files upon receiving a HUP signal; this signal
Modified: 2.5/innfeed/configfile.l
===================================================================
--- 2.5/innfeed/configfile.l 2013-07-31 17:24:20 UTC (rev 9519)
+++ 2.5/innfeed/configfile.l 2013-07-31 17:25:38 UTC (rev 9520)
@@ -31,20 +31,6 @@
warnings about it. */
static void yyunput(int, char *) UNUSED;
-/* Prototype the various accessor functions generated by flex to avoid
- missing prototype warnings. */
-int yyget_lineno(void);
-FILE *yyget_in(void);
-FILE *yyget_out(void);
-int yyget_leng(void);
-char *yyget_text(void);
-int yyget_debug(void);
-void yyset_lineno(int);
-void yyset_in(FILE *);
-void yyset_out(FILE *);
-void yyset_debug(int);
-int yylex_destroy(void);
-
char *strPtr = 0 ;
int strPtrLen = 0 ;
int strIdx = 0 ;
@@ -52,7 +38,6 @@
int lineCount = 0 ;
int current ;
-static void strAppend (int ch);
static void strAppend (int ch)
{
if (strIdx == strPtrLen)
@@ -162,11 +147,13 @@
return (CHAR) ;}
\"[^\"]* {{
- int i ;
+ size_t i ;
for (i = 1, strIdx = 0, sawBsl = 0 ; ; i++)
{
- if (i < yyleng)
+ /* Cast yyget_leng() to size_t because it used to be an int
+ * in flex versions anterior to 2.5.35 (not included). */
+ if (i < (size_t) yyget_leng())
current = yytext [i] ;
else
current = input() ;
More information about the inn-committers
mailing list