Bump year. Change Aps->ApS

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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 6f3e44a..f073744 100644 (file)
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,6 +1,6 @@
-/* $Id: rsnull.c,v 1.25 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: rsnull.c,v 1.31 2005-01-15 19:38:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -31,18 +31,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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, double *current, double *total);
-static int r_read (RSFD rfd, void *buf);
+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 = 
 {
     "null",
     r_delete,
+    rset_get_no_terms,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos,
     r_read,
@@ -53,7 +52,7 @@ const struct rset_control *rset_kind_null = &control;
 
 RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);
     rnew->priv=NULL;
     return rnew;
 }
@@ -63,7 +62,7 @@ static RSFD r_open (RSET ct, int flag)
     RSFD rfd;
     if (flag & RSETF_WRITE)
     {
-        logf (LOG_FATAL, "NULL set type is read-only");
+        yaz_log (YLOG_FATAL, "NULL set type is read-only");
         return NULL;
     }
     rfd=rfd_create_base(ct);
@@ -80,9 +79,6 @@ static void r_delete (RSET ct)
 {
 }
 
-static void r_rewind (RSFD rfd)
-{
-}
 
 static void r_pos (RSFD rfd, double *current, double *total)
 {
@@ -93,14 +89,16 @@ static void r_pos (RSFD rfd, double *current, double *total)
     *current=0;
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
+    if (term)
+        *term=0; /* NULL */
     return 0;
 }
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    logf (LOG_FATAL, "NULL set type is read-only");
+    yaz_log (YLOG_FATAL, "NULL set type is read-only");
     return -1;
 }