From: Nick Kew Date: Sat, 29 Mar 2008 19:56:55 +0000 (+0000) Subject: Thou shalt not let tabs creep in. X-Git-Tag: 2.3.0~843 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6df04a66fa76c14a94b167d1bc5e2da202dd6c03;p=thirdparty%2Fapache%2Fhttpd.git Thou shalt not let tabs creep in. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@642596 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/ap_expr.h b/include/ap_expr.h index 5ff987b6f70..cccf42f092a 100644 --- a/include/ap_expr.h +++ b/include/ap_expr.h @@ -83,7 +83,7 @@ AP_DECLARE(parse_node_t*) ap_expr_parse(apr_pool_t *pool, const char *expr, * @return the value the expression parsed to */ AP_DECLARE(int) ap_expr_eval(request_rec *r, parse_node_t *root, - int *was_error, backref_t **reptr, + int *was_error, backref_t **reptr, string_func_t string_func, opt_func_t eval_func); /** * Evaluate an expression @@ -97,5 +97,5 @@ AP_DECLARE(int) ap_expr_eval(request_rec *r, parse_node_t *root, */ AP_DECLARE(int) ap_expr_evalstring(request_rec *r, const char *expr, int *was_error, backref_t **reptr, - string_func_t string_func, + string_func_t string_func, opt_func_t eval_func); diff --git a/server/util_expr.c b/server/util_expr.c index d1ab34236da..15f20c0e140 100644 --- a/server/util_expr.c +++ b/server/util_expr.c @@ -866,9 +866,9 @@ AP_DECLARE(int) ap_expr_evalstring(request_rec *r, const char *expr, { parse_node_t *root = ap_expr_parse(r->pool, expr, was_error); if (*was_error || !root) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Error parsing expression in %s", r->filename); - return 0; + return 0; } return ap_expr_eval(r, root, was_error, reptr, string_func, eval_func); }