Use TR_LIST for TR_FILTER's 'flines' member

diff --git a/common/tr_filter.c b/common/tr_filter.c
index aaa9b35..9e5b4c3 100644 (file)
--- a/common/tr_filter.c
+++ b/common/tr_filter.c
@@ -564,26 +564,6 @@ void tr_fline_free(TR_FLINE *fline)
   talloc_free(fline);
 }
 
-TR_FSPEC *tr_fline_add_spec(TR_FLINE *fline, TR_FSPEC *spec)
-{
-  guint old_len = fline->specs->len;
-  g_ptr_array_add(fline->specs, spec);
-
-  if (old_len == fline->specs->len)
-    return NULL; /* failed to add */
-
-  talloc_steal(fline, spec);
-  return spec;
-}
-
-static int tr_fline_destructor(void *object)
-{
-  TR_FLINE *fline = talloc_get_type_abort(object, TR_FLINE);
-  if (fline->specs)
-    g_ptr_array_unref(fline->specs);
-  return 0;
-}
-
 TR_FLINE *tr_fline_new(TALLOC_CTX *mem_ctx)
 {
   TR_FLINE *fl = talloc(mem_ctx, TR_FLINE);
@@ -592,12 +572,11 @@ TR_FLINE *tr_fline_new(TALLOC_CTX *mem_ctx)
     fl->action = TR_FILTER_ACTION_UNKNOWN;
     fl->realm_cons = NULL;
     fl->domain_cons = NULL;
-    fl->specs = g_ptr_array_new();
+    fl->specs = tr_list_new(fl);
     if (fl->specs == NULL) {
       talloc_free(fl);
       return NULL;
     }
-    talloc_set_destructor((void *)fl, tr_fline_destructor);
   }
   return fl;
 }
@@ -632,40 +611,6 @@ TR_FILTER_TYPE tr_filter_get_type(TR_FILTER *filt)
   return filt->type;
 }
 
-TR_FLINE_ITER *tr_fline_iter_new(TALLOC_CTX *mem_ctx)
-{
-  TR_FLINE_ITER *iter = talloc(mem_ctx, TR_FLINE_ITER);
-  if (iter) {
-    iter->fline = NULL;
-  }
-  return iter;
-}
-
-void tr_fline_iter_free(TR_FLINE_ITER *iter)
-{
-  talloc_free(iter);
-}
-
-TR_FSPEC * tr_fline_iter_first(TR_FLINE_ITER *iter, TR_FLINE *fline)
-{
-  if (!iter || !fline || !(fline->specs))
-    return NULL;
-
-  iter->fline = fline;
-  iter->ii = 0;
-  return tr_fline_iter_next(iter);
-}
-
-TR_FSPEC * tr_fline_iter_next(TR_FLINE_ITER *iter)
-{
-  if (!iter)
-    return NULL;
-
-  if (iter->ii < iter->fline->specs->len)
-    return g_ptr_array_index(iter->fline->specs, iter->ii++);
-  return NULL;
-}
-
 /**
  * Check that a filter is valid, i.e., can be processed.
  *

diff --git a/include/tr_filter.h b/include/tr_filter.h
index 6fdbc5f..2ce469b 100644 (file)
--- a/include/tr_filter.h
+++ b/include/tr_filter.h
@@ -71,16 +71,11 @@ typedef struct tr_fspec {
 
 typedef struct tr_fline {
   TR_FILTER_ACTION action;
-  GPtrArray *specs;
+  TR_LIST *specs;
   TR_CONSTRAINT *realm_cons;
   TR_CONSTRAINT *domain_cons;
 } TR_FLINE;
 
-typedef struct tr_fline_iter {
-  TR_FLINE *fline;
-  guint ii;
-} TR_FLINE_ITER;
-
 typedef struct tr_filter {
   TR_FILTER_TYPE type;
   TR_LIST *lines;
@@ -134,11 +129,6 @@ typedef TR_LIST_ITER TR_FILTER_ITER;
 #define tr_filter_iter_next(ITER) ((TR_FLINE *) tr_list_iter_next(ITER))
 #define tr_filter_add_line(FILT, LINE) ((TR_FLINE *) tr_list_add((FILT)->lines, (LINE), 1))
 
-TR_FLINE_ITER *tr_fline_iter_new(TALLOC_CTX *mem_ctx);
-void tr_fline_iter_free(TR_FLINE_ITER *iter);
-TR_FSPEC * tr_fline_iter_first(TR_FLINE_ITER *iter, TR_FLINE *fline);
-TR_FSPEC * tr_fline_iter_next(TR_FLINE_ITER *iter);
-
 /* Iterator for TR_FSPEC matches */
 typedef TR_LIST_ITER TR_FSPEC_ITER;
 #define tr_fspec_iter_new(CTX) (tr_list_iter_new(CTX))
@@ -147,6 +137,14 @@ typedef TR_LIST_ITER TR_FSPEC_ITER;
 #define tr_fspec_iter_next(ITER) (tr_list_iter_next(ITER))
 #define tr_fspec_add_match(SPEC, MATCH) ((TR_NAME *) tr_list_add((SPEC)->match, (MATCH), 0))
 
+/* Iterator for TR_FLINE matches */
+typedef TR_LIST_ITER TR_FLINE_ITER;
+#define tr_fline_iter_new(CTX) (tr_list_iter_new(CTX))
+#define tr_fline_iter_free(ITER) (tr_list_iter_free(ITER))
+#define tr_fline_iter_first(ITER, LINE) (tr_list_iter_first((ITER), (LINE)->specs))
+#define tr_fline_iter_next(ITER) (tr_list_iter_next(ITER))
+#define tr_fline_add_spec(LINE, SPEC) ((TR_NAME *) tr_list_add((LINE)->specs, (SPEC), 1))
+
 /*In tr_constraint.c and exported, but not really a public symbol; needed by tr_filter.c and by tr_constraint.c*/
 int TR_EXPORT tr_prefix_wildcard_match(const char *str, const char *wc_str);