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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 09ee8c2..4e9cc70 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,8 +1,5 @@
-/* $Id: rsnull.c,v 1.34 2005-05-03 09:11:36 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <idzebra/util.h>
@@ -30,24 +30,24 @@ static void r_close(RSFD rfd);
 static void r_delete(RSET ct);
 static void r_pos(RSFD rfd, double *current, double *total);
 static int r_read(RSFD rfd, void *buf, TERMID *term);
-static int r_write(RSFD rfd, const void *buf);
 
-static const struct rset_control control = 
+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_no_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 +67,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 +78,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)
@@ -90,9 +89,12 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
     return 0;
 }
 
-static int r_write(RSFD rfd, const void *buf)
-{
-    yaz_log (YLOG_FATAL, "NULL set type is read-only");
-    return -1;
-}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */