From 68ec840bca073bc8e8ea2f58ad36078df9c619c1 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 15 Jul 2002 01:46:17 +0000 Subject: ** fixes for #10781 2002-07-10 Not Zed ** fixes for #10781 * filter-int.c (xml_encode): (xml_decode): Handle encoding/decoding with a type name, in a manner compatible with the score/label elemtns. (filter_int_new_type): New constructor to create a generic 'int' type. * filter-score.c: Removed. Now relies on using a filter-int with appropriate settings. * filter-label.[ch]: Now inherits from filter-int. * rule-context.c (rule_context_revert): New method to revert a filter context back to a user-file's definition. (revert): implementation. * filter-rule.h: Added new virtual method _eq and wrapper, and fixed all subclasses to implement it. * filter-element.h: Added new virtual method _eq and wrapper. Fixed all subclasses to implement it. svn path=/trunk/; revision=17448 --- filter/filter-filter.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'filter/filter-filter.c') diff --git a/filter/filter-filter.c b/filter/filter-filter.c index 199018da6c..0aae6b9805 100644 --- a/filter/filter-filter.c +++ b/filter/filter-filter.c @@ -40,6 +40,7 @@ #define d(x) static int validate(FilterRule *); +static int filter_eq(FilterRule *fr, FilterRule *cm); static xmlNodePtr xml_encode (FilterRule *); static int xml_decode (FilterRule *, xmlNodePtr, struct _RuleContext *f); static void rule_copy (FilterRule *dest, FilterRule *src); @@ -98,6 +99,7 @@ filter_filter_class_init (FilterFilterClass *class) /* override methods */ filter_rule->validate = validate; + filter_rule->eq = filter_eq; filter_rule->xml_encode = xml_encode; filter_rule->xml_decode = xml_decode; /*filter_rule->build_code = build_code;*/ @@ -206,6 +208,29 @@ validate(FilterRule *fr) return valid; } +static int +list_eq(GList *al, GList *bl) +{ + int truth = TRUE; + + while (truth && al && bl) { + FilterPart *a = al->data, *b = bl->data; + + truth = filter_part_eq(a, b); + al = al->next; + bl = bl->next; + } + + return truth && al == NULL && bl == NULL; +} + +static int +filter_eq(FilterRule *fr, FilterRule *cm) +{ + return ((FilterRuleClass *)(parent_class))->eq(fr, cm) + && list_eq(((FilterFilter *)fr)->actions, ((FilterFilter *)cm)->actions); +} + static xmlNodePtr xml_encode (FilterRule *fr) { -- cgit v1.2.3