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-input.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'filter/filter-input.c') diff --git a/filter/filter-input.c b/filter/filter-input.c index 8343abbfa8..9be03e66c1 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -40,6 +40,7 @@ #define d(x) static gboolean validate (FilterElement *fe); +static int input_eq(FilterElement *fe, FilterElement *cm); static void xml_create(FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode(FilterElement *fe); static int xml_decode(FilterElement *fe, xmlNodePtr node); @@ -99,6 +100,7 @@ filter_input_class_init (FilterInputClass *class) /* override methods */ filter_element->validate = validate; + filter_element->eq = input_eq; filter_element->xml_create = xml_create; filter_element->xml_encode = xml_encode; filter_element->xml_decode = xml_decode; @@ -213,6 +215,30 @@ validate (FilterElement *fe) return valid; } +static int +list_eq(GList *al, GList *bl) +{ + int truth = TRUE; + + while (truth && al && bl) { + truth = strcmp((char *)al->data, (char *)bl->data) == 0; + al = al->next; + bl = bl->next; + } + + return truth && al == NULL && bl == NULL; +} + +static int +input_eq(FilterElement *fe, FilterElement *cm) +{ + FilterInput *fi = (FilterInput *)fe, *ci = (FilterInput *)cm; + + return ((FilterElementClass *)(parent_class))->eq(fe, cm) + && strcmp(fi->type, ci->type) == 0 + && list_eq(fi->values, ci->values); +} + static void xml_create (FilterElement *fe, xmlNodePtr node) { -- cgit v1.2.3