X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=8d1875198262e9ccbb324b7fb7bb052964b9cc87;hb=4b4ea60e30c8a36a9f9a516f19e61b721a16a21f;hp=520e8596fdb5c9ff5cf49c9c49eee46c568d701b;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index 520e859..8d18751 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.55 2005-05-03 09:11:36 adam Exp $
+/* $Id: rsbool.c,v 1.58 2006-05-10 08:13:33 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -106,8 +106,12 @@ static RSET rsbool_create_base(const struct rset_control *ctrl,
 			       struct rset_key_control *kcontrol,
 			       int scope, RSET rset_l, RSET rset_r)
 {
-    RSET rnew = rset_create_base(ctrl, nmem, kcontrol, scope, 0);
+    RSET children[2], rnew;
     struct rset_private *info;
+
+    children[0] = rset_l;
+    children[1] = rset_r;
+    rnew = rset_create_base(ctrl, nmem, kcontrol, scope, 0, 2, children);
     info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info));
     info->rset_l = rset_l;
     info->rset_r = rset_r;
@@ -139,9 +143,6 @@ RSET rsbool_create_not(NMEM nmem, struct rset_key_control *kcontrol,
 
 static void r_delete(RSET ct)
 {
-    struct rset_private *info = (struct rset_private *) ct->priv;
-    rset_delete (info->rset_l);
-    rset_delete (info->rset_r);
 }
 
 static RSFD r_open(RSET ct, int flag)
@@ -182,7 +183,6 @@ static void r_close (RSFD rfd)
 
     rset_close (prfd->rfd_l);
     rset_close (prfd->rfd_r);
-    rfd_delete_base(rfd);
 }
 
 static int r_forward(RSFD rfd, void *buf, TERMID *term,
@@ -512,3 +512,11 @@ static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
     rset_getterms(info->rset_r, terms, maxterms, curterm);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+