Add a generic TR_LIST type, use for TR_FILTER's 'lines' member

[trust_router.git] / include / tr_filter.h

diff --git a/include/tr_filter.h b/include/tr_filter.h
index d5e2b86..0ca2f37 100644 (file)
--- a/include/tr_filter.h
+++ b/include/tr_filter.h
@@ -39,6 +39,7 @@
 #include <jansson.h>
 #include <glib.h>
 
+#include <tr_list.h>
 #include <tr_name_internal.h>
 #include <trust_router/tr_constraint.h>
 #include <trust_router/tid.h>
@@ -87,14 +88,9 @@ typedef struct tr_fline_iter {
 
 typedef struct tr_filter {
   TR_FILTER_TYPE type;
-  GPtrArray *lines;
+  TR_LIST *lines;
 } TR_FILTER;
 
-typedef struct tr_filter_iter {
-  TR_FILTER *filter;
-  guint ii;
-} TR_FILTER_ITER;
-
 typedef struct tr_filter_set TR_FILTER_SET;
 struct tr_filter_set {
   TR_FILTER *this;
@@ -135,10 +131,13 @@ TR_NAME *tr_fspec_add_match(TR_FSPEC *fspec, TR_NAME *match);
 
 int tr_fspec_matches(TR_FSPEC *fspec, TR_FILTER_TYPE ftype, TR_FILTER_TARGET *target);
 
-TR_FILTER_ITER *tr_filter_iter_new(TALLOC_CTX *mem_ctx);
-void tr_filter_iter_free(TR_FILTER_ITER *iter);
-TR_FLINE *tr_filter_iter_first(TR_FILTER_ITER *iter, TR_FILTER *filter);
-TR_FLINE *tr_filter_iter_next(TR_FILTER_ITER *iter);
+/* Iterator for TR_FILTER.lines */
+typedef TR_LIST_ITER TR_FILTER_ITER;
+#define tr_filter_iter_new(CTX) (tr_list_iter_new(CTX))
+#define tr_filter_iter_free(ITER) (tr_list_iter_free(ITER))
+#define tr_filter_iter_first(ITER, FILT) (tr_list_iter_first((ITER), (FILT)->lines))
+#define tr_filter_iter_next(ITER) (tr_list_iter_next(ITER))
+#define tr_filter_add_line(FILT, LINE) ((TR_FLINE *) tr_list_add((FILT)->lines, (LINE)))
 
 TR_FLINE_ITER *tr_fline_iter_new(TALLOC_CTX *mem_ctx);
 void tr_fline_iter_free(TR_FLINE_ITER *iter);