X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=include%2Frset.h;h=b6da79552f6ce877b537be42d53d2c12d38d5397;hb=1bb217ab477284fd7fee47f19a6e8a780fa2bb50;hp=e6bd85677a3238199c4c50cf7bcdfd3cd117d599;hpb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index e6bd856..b6da795 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.23 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rset.h,v 1.27 2004-08-06 12:28:22 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -46,8 +46,7 @@ struct rset_control
     int (*f_forward)(RSET ct, RSFD rfd, void *buf,  int *term_index,
                      int (*cmpfunc)(const void *p1, const void *p2), 
                      const void *untilbuf);
-    void (*f_pos)(RSFD rfd, int *current, int *total);
-       /* FIXME - Should be 64-bit ints !*/
+    void (*f_pos)(RSFD rfd, double *current, double *total);
        /* returns -1,-1 if pos function not implemented for this type */
     int (*f_read)(RSFD rfd, void *buf, int *term_index);
     int (*f_write)(RSFD rfd, const void *buf);
@@ -56,11 +55,11 @@ struct rset_control
 int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index, 
                      int (*cmpfunc)(const void *p1, const void *p2), 
                      const void *untilbuf);
-void rset_default_pos(RSFD rfd, int *current, int *total);
+void rset_default_pos(RSFD rfd, double *current, double *total);
 
 struct rset_term {
     char *name;
-    int  nn;
+    zint nn;
     char *flags;
     int  count;
     int  type;
@@ -104,8 +103,9 @@ RSET rset_dup (RSET rs);
 #define rset_forward(rs, fd, buf, indx, cmpfunc, untilbuf) \
     (*(rs)->control->f_forward)((rs), (fd), (buf), (indx), (cmpfunc), (untilbuf))
 
-/* int rset_count(RSET rs); */
-#define rset_count(rs) (*(rs)->control->f_count)(rs)
+/* int rset_pos(RSET rs, RSFD fd, double *current, double *total); */
+#define rset_pos(rs,fd,cur,tot) \
+    (*(rs)->control->f_pos)( (fd),(cur),(tot))
 
 /* int rset_read(RSET rs, void *buf, int *indx); */
 #define rset_read(rs, fd, buf, indx) (*(rs)->control->f_read)((fd), (buf), indx)