nd 2003/08/25 15:52:48
Modified: modules/filters mod_include.c
Log:
TOKEN_NOT and TOKEN_LBRACE duplicate exactly the same tree generation
code. Get a rid of this duplication.
Revision Changes Path
1.270 +1 -20 httpd-2.0/modules/filters/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- mod_include.c 25 Aug 2003 22:06:45 -0000 1.269
+++ mod_include.c 25 Aug 2003 22:52:48 -0000 1.270
@@ -1247,26 +1247,6 @@
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 @@
}
break;
+ case TOKEN_NOT:
case TOKEN_LBRACE:
switch (current->token.type) {
case TOKEN_STRING:
|