Upgrade to NSIS 2

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

diff --git a/rset/rsisamd.c b/rset/rsisamd.c
index 46f548d..8506716 100644 (file)
--- 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 2004-08-03 14:54:41 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -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)
 {