X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection-private.h;h=0126e892b1774f2071f255a0362ebb9404d77ef3;hp=1d4e019a01fe45db4d464c9bd387a2258d04b83d;hb=b4d485cde96751e1ec832d0e75a3e6081006a1a4;hpb=05f8e6e8f6132ef71e51280a75a9ad9aa0c00665

diff --git a/src/frontend/connection-private.h b/src/frontend/connection-private.h
index 1d4e019..0126e89 100644
--- a/src/frontend/connection-private.h
+++ b/src/frontend/connection-private.h
@@ -79,18 +79,25 @@ struct sdb_conn {
  * node types
  */
 
-typedef struct {
-	sdb_conn_node_t super;
-	char *name;
-} conn_fetch_t;
-#define CONN_FETCH(obj) ((conn_fetch_t *)(obj))
-
 typedef struct {
 	sdb_conn_node_t super;
 	sdb_store_matcher_t *matcher;
 } conn_matcher_t;
 #define CONN_MATCHER(obj) ((conn_matcher_t *)(obj))
 
+typedef struct {
+	sdb_conn_node_t super;
+	conn_matcher_t *filter;
+} conn_list_t;
+#define CONN_LIST(obj) ((conn_list_t *)(obj))
+
+typedef struct {
+	sdb_conn_node_t super;
+	char *name;
+	conn_matcher_t *filter;
+} conn_fetch_t;
+#define CONN_FETCH(obj) ((conn_fetch_t *)(obj))
+
 typedef struct {
 	sdb_conn_node_t super;
 	conn_matcher_t *matcher;
@@ -101,27 +108,32 @@ typedef struct {
 /*
  * type helper functions
  */
+
+static void __attribute__((unused))
+conn_matcher_destroy(sdb_object_t *obj)
+{
+	sdb_object_deref(SDB_OBJ(CONN_MATCHER(obj)->matcher));
+} /* conn_matcher_destroy */
+
+static void __attribute__((unused))
+conn_list_destroy(sdb_object_t *obj)
+{
+	sdb_object_deref(SDB_OBJ(CONN_LIST(obj)->filter));
+} /* conn_list_destroy */
+
 static void __attribute__((unused))
 conn_fetch_destroy(sdb_object_t *obj)
 {
 	if (CONN_FETCH(obj)->name)
 		free(CONN_FETCH(obj)->name);
+	sdb_object_deref(SDB_OBJ(CONN_FETCH(obj)->filter));
 } /* conn_fetch_destroy */
 
-static void __attribute__((unused))
-conn_matcher_destroy(sdb_object_t *obj)
-{
-	if (CONN_MATCHER(obj)->matcher)
-		sdb_object_deref(SDB_OBJ(CONN_MATCHER(obj)->matcher));
-} /* conn_matcher_destroy */
-
 static void __attribute__((unused))
 conn_lookup_destroy(sdb_object_t *obj)
 {
-	if (CONN_LOOKUP(obj)->matcher)
-		sdb_object_deref(SDB_OBJ(CONN_LOOKUP(obj)->matcher));
-	if (CONN_LOOKUP(obj)->filter)
-		sdb_object_deref(SDB_OBJ(CONN_LOOKUP(obj)->filter));
+	sdb_object_deref(SDB_OBJ(CONN_LOOKUP(obj)->matcher));
+	sdb_object_deref(SDB_OBJ(CONN_LOOKUP(obj)->filter));
 } /* conn_lookup_destroy */
 
 #ifdef __cplusplus