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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index ef0c49b..4e9cc70 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,8 +1,5 @@
-/* $Id: rsnull.c,v 1.33 2005-04-26 10:09:38 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,47 +12,47 @@ 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>
 #include <rset.h>
 
+static RSFD r_open(RSET ct, int flag);
+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 RSFD r_open (RSET ct, int flag);
-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, const struct 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);
-    rnew->priv=NULL;
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, term, 0, 0);
+    rnew->priv = 0;
     return rnew;
 }
 
-static RSFD r_open (RSET ct, int flag)
+static RSFD r_open(RSET ct, int flag)
 {
     RSFD rfd;
     if (flag & RSETF_WRITE)
@@ -63,40 +60,41 @@ static RSFD r_open (RSET ct, int flag)
         yaz_log (YLOG_FATAL, "NULL set type is read-only");
         return NULL;
     }
-    rfd=rfd_create_base(ct);
-    rfd->priv=NULL; 
+    rfd = rfd_create_base(ct);
+    rfd->priv = 0;
     return rfd;
 }
 
-static void r_close (RSFD rfd)
+static void r_close(RSFD rfd)
 {
-    rfd_delete_base(rfd);
 }
 
-static void r_delete (RSET ct)
+static void r_delete(RSET ct)
 {
 }
 
-
-static void r_pos (RSFD rfd, double *current, double *total)
+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)
+static int r_read(RSFD rfd, void *buf, TERMID *term)
 {
     if (term)
-        *term=0; /* NULL */
+        *term = 0;
     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
+ */