Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 51438 invoked from network); 11 Dec 2010 17:17:20 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Dec 2010 17:17:20 -0000 Received: (qmail 83969 invoked by uid 500); 11 Dec 2010 17:17:20 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 83878 invoked by uid 500); 11 Dec 2010 17:17:19 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 83871 invoked by uid 99); 11 Dec 2010 17:17:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Dec 2010 17:17:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Dec 2010 17:17:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D9CA23888A6; Sat, 11 Dec 2010 17:16:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1044679 - /httpd/httpd/trunk/server/util_expr_eval.c Date: Sat, 11 Dec 2010 17:16:54 -0000 To: cvs@httpd.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101211171654.9D9CA23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Sat Dec 11 17:16:54 2010 New Revision: 1044679 URL: http://svn.apache.org/viewvc?rev=1044679&view=rev Log: indentation + coding style fixes 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=1044679&r1=1044678&r2=1044679&view=diff ============================================================================== --- httpd/httpd/trunk/server/util_expr_eval.c (original) +++ httpd/httpd/trunk/server/util_expr_eval.c Sat Dec 11 17:16:54 2010 @@ -56,38 +56,38 @@ static const char *ap_expr_eval_word(ap_ { const char *result = ""; switch (node->node_op) { - case op_Digit: - case op_String: - result = node->node_arg1; - break; - case op_Var: - result = ap_expr_eval_var(ctx, node->node_arg1, node->node_arg2); - break; - case op_Concat: { - const char *s1 = ap_expr_eval_word(ctx, node->node_arg1); - const char *s2 = ap_expr_eval_word(ctx, node->node_arg2); - if (!*s1) - result = s2; - else if (!*s2) - result = s1; - else - result = apr_pstrcat(ctx->p, s1, s2, NULL); - break; - } - case op_StringFuncCall: { - const ap_expr_t *info = node->node_arg1; - const ap_expr_t *args = node->node_arg2; - result = ap_expr_eval_string_func(ctx, info, args); - break; - } - case op_RegexBackref: { - const int *np = node->node_arg1; - result = ap_expr_eval_re_backref(ctx, *np); - break; - } - default: - *ctx->err = "Internal evaluation error: Unknown word expression node"; - break; + case op_Digit: + case op_String: + result = node->node_arg1; + break; + case op_Var: + result = ap_expr_eval_var(ctx, node->node_arg1, node->node_arg2); + break; + case op_Concat: { + const char *s1 = ap_expr_eval_word(ctx, node->node_arg1); + const char *s2 = ap_expr_eval_word(ctx, node->node_arg2); + if (!*s1) + result = s2; + else if (!*s2) + result = s1; + else + result = apr_pstrcat(ctx->p, s1, s2, NULL); + break; + } + case op_StringFuncCall: { + const ap_expr_t *info = node->node_arg1; + const ap_expr_t *args = node->node_arg2; + result = ap_expr_eval_string_func(ctx, info, args); + break; + } + case op_RegexBackref: { + const int *np = node->node_arg1; + result = ap_expr_eval_re_backref(ctx, *np); + break; + } + default: + *ctx->err = "Internal evaluation error: Unknown word expression node"; + break; } if (!result) result = ""; @@ -146,70 +146,34 @@ static int intstrcmp(const char *s1, con static int ap_expr_eval_comp(ap_expr_eval_ctx_t *ctx, const ap_expr_t *node) { + const ap_expr_t *e1 = node->node_arg1; + const ap_expr_t *e2 = node->node_arg2; switch (node->node_op) { - case op_EQ: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) == 0); - } - case op_NE: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) != 0); - } - case op_LT: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) < 0); - } - case op_LE: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) <= 0); - } - case op_GT: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) > 0); - } - case op_GE: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) >= 0); - } - case op_STR_EQ: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) == 0); - } - case op_STR_NE: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) != 0); - } - case op_STR_LT: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) < 0); - } - case op_STR_LE: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) <= 0); - } - case op_STR_GT: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) > 0); - } - case op_STR_GE: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) >= 0); - } - case op_IN: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; + case op_EQ: + return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) == 0); + case op_NE: + return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) != 0); + case op_LT: + return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) < 0); + case op_LE: + return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) <= 0); + case op_GT: + return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) > 0); + case op_GE: + return (intstrcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) >= 0); + case op_STR_EQ: + return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) == 0); + case op_STR_NE: + return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) != 0); + case op_STR_LT: + return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) < 0); + case op_STR_LE: + return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) <= 0); + case op_STR_GT: + return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) > 0); + case op_STR_GE: + return (strcmp(ap_expr_eval_word(ctx, e1), ap_expr_eval_word(ctx, e2)) >= 0); + case op_IN: { const char *needle = ap_expr_eval_word(ctx, e1); if (e2->node_op == op_ListElement) { do { @@ -240,19 +204,12 @@ static int ap_expr_eval_comp(ap_expr_eva } return 0; } - case op_REG: - case op_NRE: { - const ap_expr_t *e1; - const ap_expr_t *e2; - const char *word; - const ap_regex_t *regex; + case op_REG: + case op_NRE: { + const char *word = ap_expr_eval_word(ctx, e1); + const ap_regex_t *regex = e2->node_arg1; int result; - e1 = node->node_arg1; - e2 = node->node_arg2; - word = ap_expr_eval_word(ctx, e1); - regex = e2->node_arg1; - /* * $0 ... $9 may contain stuff the user wants to keep. Therefore * we only set them if there are capturing parens in the regex. @@ -271,10 +228,9 @@ static int ap_expr_eval_comp(ap_expr_eva else return !result; } - default: { - *ctx->err = "Internal evaluation error: Unknown comp expression node"; - return -1; - } + default: + *ctx->err = "Internal evaluation error: Unknown comp expression node"; + return -1; } } @@ -698,48 +654,31 @@ static int ap_expr_eval_binary_op(ap_exp static int ap_expr_eval(ap_expr_eval_ctx_t *ctx, const ap_expr_t *node) { + const ap_expr_t *e1 = node->node_arg1; + const ap_expr_t *e2 = node->node_arg2; switch (node->node_op) { - case op_True: { - return 1; - } - case op_False: { - return 0; - } - case op_Not: { - const ap_expr_t *e = node->node_arg1; - return (!ap_expr_eval(ctx, e)); - } - case op_Or: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (ap_expr_eval(ctx, e1) || ap_expr_eval(ctx, e2)); - } - case op_And: { - const ap_expr_t *e1 = node->node_arg1; - const ap_expr_t *e2 = node->node_arg2; - return (ap_expr_eval(ctx, e1) && ap_expr_eval(ctx, e2)); - } - case op_UnaryOpCall: { - const ap_expr_t *info = node->node_arg1; - const ap_expr_t *args = node->node_arg2; - return ap_expr_eval_unary_op(ctx, info, args); - } - case op_BinaryOpCall: { - const ap_expr_t *info = node->node_arg1; - const ap_expr_t *args = node->node_arg2; - return ap_expr_eval_binary_op(ctx, info, args); - } - case op_Comp: { - const ap_expr_t *e = node->node_arg1; - if (ctx->info->flags & AP_EXPR_FLAGS_SSL_EXPR_COMPAT) - return ssl_expr_eval_comp(ctx, e); - else - return ap_expr_eval_comp(ctx, e); - } - default: { - *ctx->err = "Internal evaluation error: Unknown expression node"; - return FALSE; - } + case op_True: + return 1; + case op_False: + return 0; + case op_Not: + return (!ap_expr_eval(ctx, e1)); + case op_Or: + return (ap_expr_eval(ctx, e1) || ap_expr_eval(ctx, e2)); + case op_And: + return (ap_expr_eval(ctx, e1) && ap_expr_eval(ctx, e2)); + case op_UnaryOpCall: + return ap_expr_eval_unary_op(ctx, e1, e2); + case op_BinaryOpCall: + return ap_expr_eval_binary_op(ctx, e1, e2); + case op_Comp: + if (ctx->info->flags & AP_EXPR_FLAGS_SSL_EXPR_COMPAT) + return ssl_expr_eval_comp(ctx, e1); + else + return ap_expr_eval_comp(ctx, e1); + default: + *ctx->err = "Internal evaluation error: Unknown expression node"; + return FALSE; } }