Remove some unused functions for which flex forgets to add prototypes, leading

to compiler warnings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039543 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/Makefile.in b/server/Makefile.in
index 98d8ee9be3e77f3969111d011088abe4b719671a..8067122f56e11068f8a415e4955a29655e542396 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -99,4 +99,7 @@ util_expr_scan.c util_expr_parse.c util_expr_parse.h: util_expr_scan.l util_expr
                        $(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

diff --git a/server/util_expr_scan.c b/server/util_expr_scan.c
index d7b1483cea93e5e655560a258cebdc5eb87f5e79..aef744015e84ae851161a124f7f3ece905a32066 100644 (file)
--- a/server/util_expr_scan.c
+++ b/server/util_expr_scan.c
@@ -2336,15 +2336,6 @@ int ap_expr_yyget_lineno  (yyscan_t yyscanner)
 /** 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_number , yyscan_t yyscanner)
  * @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.