X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamd.c;h=90506808327d2225aaf1ef48c766f5bcb2cd9546;hb=668b136879471079ce03b26981a5fd1b3a210bc1;hp=46f548d7c2611e649497900fc17d9fbac38abf8f;hpb=9949fe7912e81ebf77d345a0581dc31a439bc2b8;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamd.c b/rset/rsisamd.c
index 46f548d..9050680 100644
--- a/rset/rsisamd.c
+++ b/rset/rsisamd.c
@@ -1,5 +1,5 @@
-/* $Id: rsisamd.c,v 1.5 2004-01-16 15:27:35 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsisamd.c,v 1.8.2.1 2006-08-14 10:39:20 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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
+
 */
 
 
@@ -25,6 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <assert.h>
+#include <string.h>
 #include <zebrautl.h>
 #include <rsisamd.h>
 
@@ -33,7 +34,6 @@ 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_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
@@ -46,7 +46,7 @@ static const struct rset_control control =
     r_delete,
     r_rewind,
     rset_default_forward,
-    r_count,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -140,10 +140,6 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {