X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=rset%2Frsm_or.c;h=0e4cd986327f4ab1f06ce04c80d988b52dc5ef02;hb=e6b40b4f140e8f7348fff1f7be78ac78946421ff;hp=05f7fe1fea4cb05f4fe0f4f497a67145cb5cdc04;hpb=81a75ae20b5b250309a70de51bfdf8de0019f882;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index 05f7fe1..0e4cd98 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -1,11 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: rsm_or.c,v 1.12 2002-04-05 08:46:26 adam Exp $
- *
- */
+/* $Id: rsm_or.c,v 1.15 2004-08-03 12:15:45 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 
 
 #include <assert.h>
@@ -23,7 +38,7 @@ 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 int r_count (RSET ct);
+/* static int r_count (RSET ct); */
 static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
@@ -35,7 +50,8 @@ static const struct rset_control control =
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    /* r_count, */
     r_read,
     r_write,
 };
@@ -281,10 +297,12 @@ static void r_rewind (RSFD rfd)
 {
 }
 
+/*
 static int r_count (RSET ct)
 {
     return 0;
 }
+*/
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {