[469] in BarnOwl Developers
[D-O-H] r598 - / trunk trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:06:31 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Sat, 10 Feb 2007 23:47:13 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-02-10 23:47:12 -0500 (Sat, 10 Feb 2007)
New Revision: 598
Modified:
/
trunk/
trunk/owl/filter.c
trunk/owl/filterelement.c
trunk/owl/owl.c
trunk/owl/owl.h
Log:
r15926@phanatique: nelhage | 2006-12-26 00:57:07 -0500
r15901@phanatique: nelhage | 2006-12-25 21:08:47 -0500
Base framework for the filter rewrite system. Only understands regexes and true/false so far.
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15900
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15926
Modified: trunk/owl/filter.c
===================================================================
--- trunk/owl/filter.c 2007-02-11 04:45:11 UTC (rev 597)
+++ trunk/owl/filter.c 2007-02-11 04:47:12 UTC (rev 598)
@@ -5,17 +5,6 @@
#define OWL_FILTER_MAXRECURSE 20
-static owl_filterelement fe_true;
-static owl_filterelement fe_false;
-static owl_filterelement fe_null;
-
-void owl_filterengine_init()
-{
- owl_filterelement_create_true(&fe_true);
- owl_filterelement_create_false(&fe_false);
- owl_filterelement_create_null(&fe_null);
-}
-
int owl_filter_init_fromstring(owl_filter *f, char *name, char *string)
{
char **argv;
Modified: trunk/owl/filterelement.c
===================================================================
--- trunk/owl/filterelement.c 2007-02-11 04:45:11 UTC (rev 597)
+++ trunk/owl/filterelement.c 2007-02-11 04:47:12 UTC (rev 598)
@@ -121,8 +121,10 @@
static int owl_filterelement_match_not(owl_filterelement *fe, owl_message *m)
{
return !owl_filterelement_match(fe->left, m);
+ fe->match_message = owl_filterelement_match_re;
+ fe->print_elt = owl_filterelement_print_re;
}
-
+/*
// Print methods
static void owl_filterelement_print_true(owl_filterelement *fe, char *buf)
@@ -134,6 +136,7 @@
{
strcat(buf, "false");
}
+*/
static void owl_filterelement_print_re(owl_filterelement *fe, char *buf)
{
Modified: trunk/owl/owl.c
===================================================================
Modified: trunk/owl/owl.h
===================================================================
