Added the scope parameter to rsets, and using it in all forwards and reads

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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 2b0902e..d10b274 100644 (file)
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $Id: rsnull.c,v 1.22 2004-08-24 14:25:16 heikki Exp $
+/* $Id: rsnull.c,v 1.26 2004-09-09 10:08:06 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -25,9 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
-#include <rsnull.h>
+#include <rset.h>
 
-/* FIXME - Use the nmem instead of xmalloc all the way through */
 
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
@@ -40,9 +39,9 @@ static int r_write (RSFD rfd, const void *buf);
 static const struct rset_control control = 
 {
     "null",
+    r_delete,
     r_open,
     r_close,
-    r_delete,
     r_rewind,
     rset_default_forward,
     r_pos,
@@ -52,32 +51,29 @@ static const struct rset_control control =
 
 const struct rset_control *rset_kind_null = &control;
 
-RSET rsnull_create(NMEM nmem )
+RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
 {
-    RSET rnew=rset_create_base(&control, nmem);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol,0);
     rnew->priv=NULL;
     return rnew;
 }
 
-#if 0
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
-{
-    return NULL;
-}
-#endif
-
 static RSFD r_open (RSET ct, int flag)
 {
+    RSFD rfd;
     if (flag & RSETF_WRITE)
     {
         logf (LOG_FATAL, "NULL set type is read-only");
         return NULL;
     }
-    return "";
+    rfd=rfd_create_base(ct);
+    rfd->priv=NULL; 
+    return rfd;
 }
 
 static void r_close (RSFD rfd)
 {
+    rfd_delete_base(rfd);
 }
 
 static void r_delete (RSET ct)
@@ -86,7 +82,6 @@ static void r_delete (RSET ct)
 
 static void r_rewind (RSFD rfd)
 {
-    logf (LOG_DEBUG, "rsnull_rewind");
 }
 
 static void r_pos (RSFD rfd, double *current, double *total)