X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=153e643539debdb0bb319631eb893e28b919e70f;hb=a0c8ad663e1c39942375e032abfd0be156f9c2ca;hp=09ee8c21f7bc7ac35e2d957492d51c6ee1a1b935;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 09ee8c2..153e643 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,5 +1,5 @@
-/* $Id: rsnull.c,v 1.34 2005-05-03 09:11:36 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: rsnull.c,v 1.38 2006-06-06 21:01:31 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -36,18 +36,19 @@ static const struct rset_control control =
 {
     "null",
     r_delete,
-    rset_get_no_terms,
+    rset_get_one_term,
     r_open,
     r_close,
-    rset_default_forward,
+    0, /* no forward */
     r_pos,
     r_read,
     r_write,
 };
 
-RSET rsnull_create(NMEM nmem, struct rset_key_control *kcontrol )
+RSET rset_create_null(NMEM nmem, struct rset_key_control *kcontrol,
+                      TERMID term)
 {
-    RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, 0);
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, term, 0, 0);
     rnew->priv = 0;
     return rnew;
 }
@@ -67,7 +68,6 @@ static RSFD r_open(RSET ct, int flag)
 
 static void r_close(RSFD rfd)
 {
-    rfd_delete_base(rfd);
 }
 
 static void r_delete(RSET ct)
@@ -79,8 +79,8 @@ static void r_pos(RSFD rfd, double *current, double *total)
     assert(rfd);
     assert(current);
     assert(total);
-    *total=0;
-    *current=0;
+    *total = 0;
+    *current = 0;
 }
 
 static int r_read(RSFD rfd, void *buf, TERMID *term)
@@ -92,7 +92,14 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
 
 static int r_write(RSFD rfd, const void *buf)
 {
-    yaz_log (YLOG_FATAL, "NULL set type is read-only");
+    yaz_log(YLOG_FATAL, "NULL set type is read-only");
     return -1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */