X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=7da0897a86dc55ab2aae2c397193944a07537eaa;hb=12c6db025bffd23e760ceb31120468cf363256df;hp=48dfb65a4b8e1de34a924a748025acd2461236aa;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index 48dfb65..7da0897 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.34 2004-09-09 10:08:04 heikki Exp $
+/* $Id: rset.h,v 1.36 2004-09-30 13:07:06 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -54,7 +54,6 @@ struct rset_control
     void (*f_delete)(RSET ct);
     RSFD (*f_open)(RSET ct, int wflag);
     void (*f_close)(RSFD rfd);
-    void (*f_rewind)(RSFD rfd);
     int (*f_forward)(RSFD rfd, void *buf, const void *untilbuf);
     void (*f_pos)(RSFD rfd, double *current, double *total);
        /* returns -1,-1 if pos function not implemented for this type */
@@ -128,9 +127,6 @@ RSET rset_dup (RSET rs);
 /* void rset_close(RSFD rfd); */
 #define rset_close(rfd) (*(rfd)->rset->control->f_close)(rfd)
 
-/* void rset_rewind(RSFD rfd); */
-#define rset_rewind(rfd) (*(rfd)->rset->control->f_rewind)((rfd))
-
 /* int rset_forward(RSFD rfd, void *buf, void *untilbuf); */
 #define rset_forward(rfd, buf, untilbuf) \
     (*(rfd)->rset->control->f_forward)((rfd),(buf),(untilbuf))
@@ -166,14 +162,18 @@ RSET rsbool_create_not( NMEM nmem, const struct key_control *kcontrol,
                         int scope,
                         RSET rset_l, RSET rset_r);
 
-RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol,
+RSET rsbetween_create(  NMEM nmem, const struct key_control *kcontrol,
                         int scope, 
                         RSET rset_l, RSET rset_m, RSET rset_r, 
                         RSET rset_attr);
 
-RSET rsmultior_create( NMEM nmem, const struct key_control *kcontrol,
+RSET rsmultior_create(  NMEM nmem, const struct key_control *kcontrol,
+                        int scope, 
+                        int no_rsets, RSET* rsets);
+
+RSET rsmultiand_create( NMEM nmem, const struct key_control *kcontrol,
                         int scope, 
-                      int no_rsets, RSET* rsets);
+                        int no_rsets, RSET* rsets);
 
 RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol,
                         int scope,