From a4454cb0e221239da0ee346fb0a7571df6689f10 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Mon, 22 Nov 2010 05:02:56 +0000 Subject: [PATCH] Fix for picky compilers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037605 13f79535-47bb-0310-9956-ffa450edef68 --- server/util_expr_eval.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c index 9ab4160615..3b5cf1cb11 100644 --- a/server/util_expr_eval.c +++ b/server/util_expr_eval.c @@ -743,7 +743,9 @@ AP_DECLARE(int) ap_expr_exec_re(request_rec *r, const ap_expr_info_t *info, 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_rec *r, const ap_expr_info_t *info, 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); -- 2.40.0