httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1039543 - in /httpd/httpd/trunk/server: Makefile.in util_expr_scan.c
Date Fri, 26 Nov 2010 20:04:49 GMT
Author: sf
Date: Fri Nov 26 20:04:48 2010
New Revision: 1039543

URL: http://svn.apache.org/viewvc?rev=1039543&view=rev
Log:
Remove some unused functions for which flex forgets to add prototypes, leading
to compiler warnings.

Modified:
    httpd/httpd/trunk/server/Makefile.in
    httpd/httpd/trunk/server/util_expr_scan.c

Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/Makefile.in?rev=1039543&r1=1039542&r2=1039543&view=diff
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Fri Nov 26 20:04:48 2010
@@ -99,4 +99,7 @@ util_expr_scan.c util_expr_parse.c util_
 			$(builddir)/$$f.$$$$ && \
 		mv $(builddir)/$$f.$$$$ $(builddir)/$$f ; \
 	done
-
+	# work around flex bug
+	# http://sourceforge.net/tracker/?func=detail&aid=3029024&group_id=97492&atid=618177
+	perl -0777 -p -i -e 's,\n(void|int) ap_expr_yy[gs]et_column.*?\n\},,gs' \
+		$(builddir)/util_expr_scan.c

Modified: httpd/httpd/trunk/server/util_expr_scan.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_scan.c?rev=1039543&r1=1039542&r2=1039543&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_scan.c (original)
+++ httpd/httpd/trunk/server/util_expr_scan.c Fri Nov 26 20:04:48 2010
@@ -2336,15 +2336,6 @@ int ap_expr_yyget_lineno  (yyscan_t yysc
 /** Get the current column number.
  * @param yyscanner The scanner object.
  */
-int ap_expr_yyget_column  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yycolumn;
-}
 
 /** Get the input stream.
  * @param yyscanner The scanner object.
@@ -2412,16 +2403,6 @@ void ap_expr_yyset_lineno (int  line_num
  * @param line_number
  * @param yyscanner The scanner object.
  */
-void ap_expr_yyset_column (int  column_no , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* column is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "ap_expr_yyset_column called with no buffer" , yyscanner); 
-    
-    yycolumn = column_no;
-}
 
 /** Set the input stream. This does not discard the current
  * input buffer.



Mime
View raw message