Upgrade to NSIS 2

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

diff --git a/rset/rsbool.c b/rset/rsbool.c
index bc2c692..1a6b3c9 100644 (file)
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.29 2004-06-09 11:11:33 adam Exp $
+/* $Id: rsbool.c,v 1.33 2004-08-04 09:59:03 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -25,8 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <assert.h>
 
-#include <rsbool.h>
 #include <zebrautl.h>
+#include <rsbool.h>
 
 #ifndef RSET_DEBUG
 #define RSET_DEBUG 0
@@ -40,7 +40,7 @@ static void r_rewind (RSFD rfd);
 static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
                      int (*cmpfunc)(const void *p1, const void *p2),
                      const void *untilbuf);
-static int r_count (RSET ct);
+/* static void r_pos (RSFD rfd, int *current, int *total);  */
 static int r_read_and (RSFD rfd, void *buf, int *term_index);
 static int r_read_or (RSFD rfd, void *buf, int *term_index);
 static int r_read_not (RSFD rfd, void *buf, int *term_index);
@@ -55,7 +55,7 @@ static const struct rset_control control_and =
     r_delete,
     r_rewind,
     r_forward, /* rset_default_forward, */
-    r_count,
+    rset_default_pos,
     r_read_and,
     r_write,
 };
@@ -73,7 +73,7 @@ static const struct rset_control control_or =
 #else
     rset_default_forward,
 #endif
-    r_count,
+    rset_default_pos,
     r_read_or,
     r_write,
 };
@@ -87,7 +87,7 @@ static const struct rset_control control_not =
     r_delete,
     r_rewind,
     r_forward, 
-    r_count,
+    rset_default_pos,
     r_read_not,
     r_write,
 };
@@ -227,7 +227,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 {
     struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-    int cmp=0;
     int rc;
 
 #if RSET_DEBUG
@@ -258,11 +257,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
     return rc;
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
-
 
 /*
     1,1         1,3