Fix term counters to be of type zint. Fix several printfs of zint.

[idzebra-moved-to-github.git] / rset / rsnull.c

diff --git a/rset/rsnull.c b/rset/rsnull.c
index d49d406..aacf61a 100644 (file)
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $Id: rsnull.c,v 1.15 2002-08-02 19:26:57 adam Exp $
+/* $Id: rsnull.c,v 1.20 2004-08-06 10:09:28 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -23,15 +23,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 
 #include <stdio.h>
-#include <rsnull.h>
+#include <assert.h>
 #include <zebrautl.h>
+#include <rsnull.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
-static int r_count (RSET ct);
+static void r_pos (RSFD rfd, double *current, double *total);
 static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
@@ -43,7 +44,8 @@ static const struct rset_control control =
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    r_pos,
     r_read,
     r_write,
 };
@@ -91,9 +93,13 @@ static void r_rewind (RSFD rfd)
     logf (LOG_DEBUG, "rsnull_rewind");
 }
 
-static int r_count (RSET ct)
+static void r_pos (RSFD rfd, double *current, double *total)
 {
-    return 0;
+    assert(rfd);
+    assert(current);
+    assert(total);
+    *total=0;
+    *current=0;
 }
 
 static int r_read (RSFD rfd, void *buf, int *term_index)