httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1037605 - /httpd/httpd/trunk/server/util_expr_eval.c
Date Mon, 22 Nov 2010 05:02:56 GMT
Author: fuankg
Date: Mon Nov 22 05:02:56 2010
New Revision: 1037605

URL: http://svn.apache.org/viewvc?rev=1037605&view=rev
Log:
Fix for picky compilers.

Modified:
    httpd/httpd/trunk/server/util_expr_eval.c

Modified: httpd/httpd/trunk/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_eval.c?rev=1037605&r1=1037604&r2=1037605&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Mon Nov 22 05:02:56 2010
@@ -743,7 +743,9 @@ AP_DECLARE(int) ap_expr_exec_re(request_
     ap_expr_eval_ctx ctx;
     int rc;
     int dont_vary = (info->flags & AP_EXPR_FLAGS_DONT_VARY);
-    const char *vary_this = NULL;
+    const char *tmp_source = NULL, *vary_this = NULL;
+    ap_regmatch_t tmp_pmatch[10];
+
     ctx.r = r;
     ctx.c = r->connection;
     ctx.s = r->server;
@@ -754,14 +756,11 @@ AP_DECLARE(int) ap_expr_exec_re(request_
     ctx.re_pmatch = pmatch;
     ctx.re_source = source;
     ctx.vary_this = dont_vary ? NULL : &vary_this;
-    ap_regmatch_t tmp_pmatch[10];
-    const char *tmp_source;
 
     if (!pmatch) {
         ctx.re_nmatch = 10;
         ctx.re_pmatch = tmp_pmatch;
         ctx.re_source = &tmp_source;
-        tmp_source = NULL;
     }
     else {
         AP_DEBUG_ASSERT(source != NULL);



Mime
View raw message