X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=rset%2Frsnull.c;h=2b0902ea9669e769ae28e1003eeac119392db391;hb=927733195c5646988dcc65365bb45b978b02a15a;hp=c02ff4fdb53601460197d986f33d9606e216f873;hpb=714fc16a13c620527ebc11d254ba4e7b299a25f0;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index c02ff4f..2b0902e 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $Id: rsnull.c,v 1.19 2004-08-04 09:59:03 heikki Exp $
+/* $Id: rsnull.c,v 1.22 2004-08-24 14:25:16 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -27,19 +27,19 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <zebrautl.h>
 #include <rsnull.h>
 
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
+/* 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);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
-static void r_pos (RSFD rfd, zint *current, zint *total);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static void r_pos (RSFD rfd, double *current, double *total);
+static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 
 static const struct rset_control control = 
 {
     "null",
-    r_create,
     r_open,
     r_close,
     r_delete,
@@ -52,28 +52,26 @@ static const struct rset_control control =
 
 const struct rset_control *rset_kind_null = &control;
 
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
+RSET rsnull_create(NMEM nmem )
 {
-    rset_null_parms *null_parms = (rset_null_parms *) parms;
-
-    ct->no_rset_terms = 1;
-    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
-    if (parms && null_parms->rset_term)
-	ct->rset_terms[0] = null_parms->rset_term;
-    else
-	ct->rset_terms[0] = rset_term_create ("term", -1, "rank-0",
-                                              0);
-    ct->rset_terms[0]->nn = 0;
+    RSET rnew=rset_create_base(&control, nmem);
+    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)
 {
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "NULL set type is read-only");
-	return NULL;
+        logf (LOG_FATAL, "NULL set type is read-only");
+        return NULL;
     }
     return "";
 }
@@ -84,8 +82,6 @@ static void r_close (RSFD rfd)
 
 static void r_delete (RSET ct)
 {
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
 }
 
 static void r_rewind (RSFD rfd)
@@ -93,7 +89,7 @@ static void r_rewind (RSFD rfd)
     logf (LOG_DEBUG, "rsnull_rewind");
 }
 
-static void r_pos (RSFD rfd, zint *current, zint *total)
+static void r_pos (RSFD rfd, double *current, double *total)
 {
     assert(rfd);
     assert(current);
@@ -102,9 +98,8 @@ static void r_pos (RSFD rfd, zint *current, zint *total)
     *current=0;
 }
 
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
-    *term_index = -1;
     return 0;
 }