From: André Malo <nd@apache.org>
Date: Mon, 25 Aug 2003 22:52:48 +0000 (+0000)
Subject: TOKEN_NOT and TOKEN_LBRACE duplicate exactly the same tree generation
X-Git-Tag: pre_ajp_proxy~1210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2073d0a7aeb43952b13370bed85580ae578aabe2;p=apache

TOKEN_NOT and TOKEN_LBRACE duplicate exactly the same tree generation
code. Get a rid of this duplication.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101103 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 957a1c7ab8..70f5211f7a 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1247,26 +1247,6 @@ static int parse_expr(include_ctx_t *ctx, const char *expr, int *was_error)
             current = new;
             break;
 
-        case TOKEN_NOT:
-            switch (current->token.type) {
-            case TOKEN_STRING:
-            case TOKEN_RE:
-            case TOKEN_RBRACE:
-            case TOKEN_GROUP:
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Invalid expression "
-                              "\"%s\" in file %s", expr, r->filename);
-                *was_error = 1;
-                return retval;
-
-            default:
-                break;
-            }
-
-            current->right = new;
-            new->parent = current;
-            current = new;
-            break;
-
         case TOKEN_EQ:
         case TOKEN_NE:
         case TOKEN_GE:
@@ -1329,6 +1309,7 @@ static int parse_expr(include_ctx_t *ctx, const char *expr, int *was_error)
             }
             break;
 
+        case TOKEN_NOT:
         case TOKEN_LBRACE:
             switch (current->token.type) {
             case TOKEN_STRING: