- Timestamp:
- Aug 8, 2007, 6:01:51 PM (18 years ago)
- Branches:
- master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- ce7b824
- Parents:
- b51d257
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
filter.c
r535d68b rad15610 63 63 static owl_filterelement * owl_filter_parse_primitive_expression(int argc, char **argv, int *next) 64 64 { 65 owl_filterelement *fe, *op; 66 int i = 0, skip; 67 65 68 if(!argc) return NULL; 66 69 67 owl_filterelement * fe = owl_malloc(sizeof(owl_filterelement)); 68 owl_filterelement *op; 69 70 fe = owl_malloc(sizeof(owl_filterelement)); 70 71 owl_filterelement_create(fe); 71 int i = 0, skip;72 72 73 73 if(!strcasecmp(argv[i], "(")) { … … 118 118 { 119 119 int i = 0, skip; 120 owl_filterelement * op1 = NULL, * op2 = NULL ;120 owl_filterelement * op1 = NULL, * op2 = NULL, *tmp; 121 121 122 122 op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip); … … 129 129 op2 = owl_filter_parse_primitive_expression(argc-i-1, argv+i+1, &skip); 130 130 if(!op2) goto err; 131 owl_filterelement *tmp = owl_malloc(sizeof(owl_filterelement));131 tmp = owl_malloc(sizeof(owl_filterelement)); 132 132 if(!strcasecmp(argv[i], "and")) { 133 133 owl_filterelement_create_and(tmp, op1, op2); … … 204 204 int owl_filter_message_match(owl_filter *f, owl_message *m) 205 205 { 206 int ret; 206 207 if(!f->root) return 0; 207 intret = owl_filterelement_match(f->root, m);208 ret = owl_filterelement_match(f->root, m); 208 209 if(f->polarity) ret = !ret; 209 210 return ret; … … 305 306 306 307 int owl_filter_regtest(void) { 307 owl_list_create(&(g.filterlist));308 308 int numfailed=0; 309 309 owl_message m; 310 owl_filter f1, f2, f3, f4; 311 312 owl_list_create(&(g.filterlist)); 310 313 owl_message_init(&m); 311 314 owl_message_set_type_zephyr(&m); … … 345 348 TEST_FILTER("true and false or false", 0); 346 349 347 owl_filter f1, f2, f3, f4;348 349 350 owl_filter_init_fromstring(&f1, "f1", "class owl"); 350 351 owl_global_add_filter(&g, &f1);
Note: See TracChangeset
for help on using the changeset viewer.