svn commit: r1588448 - /httpd/httpd/trunk/server/util_expr_eval.c

[mi...@apache.org]

Author: minfrin
Date: Fri Apr 18 11:47:06 2014
New Revision: 1588448

URL: http://svn.apache.org/r1588448
Log:
Move two variable assignments off the fast path.

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=1588448&r1=1588447&r2=1588448&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Fri Apr 18 11:47:06 2014
@@ -885,7 +885,7 @@ AP_DECLARE(const char *) ap_expr_str_exe
 {
     ap_expr_eval_ctx_t ctx;
     int dont_vary, rc;
-    const char *tmp_source = NULL, *vary_this = NULL;
+    const char *tmp_source, *vary_this;
     ap_regmatch_t tmp_pmatch[AP_MAX_REG_MATCH];
     const char *result;
 
@@ -897,6 +897,9 @@ AP_DECLARE(const char *) ap_expr_str_exe
         return (const char *)info->root_node->node_arg1;
     }
 
+    tmp_source = NULL;
+    vary_this = NULL;
+
     dont_vary = (info->flags & AP_EXPR_FLAG_DONT_VARY);
 
     ctx.r = r;