Using the key_control block for the first key-handling functions in all

[idzebra-moved-to-github.git] / include / rsbool.h

diff --git a/include/rsbool.h b/include/rsbool.h
index 6bcf80a..f2bf339 100644 (file)
--- a/include/rsbool.h
+++ b/include/rsbool.h
@@ -1,5 +1,5 @@
-/* $Id: rsbool.h,v 1.8 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsbool.h,v 1.11 2004-09-01 15:01:32 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.
@@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #ifndef RSET_BOOL_H
 #define RSET_BOOL_H
 
@@ -31,17 +29,22 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 extern "C" {
 #endif
 
-extern const struct rset_control *rset_kind_and;
-extern const struct rset_control *rset_kind_or;
-extern const struct rset_control *rset_kind_not;
-
-typedef struct rset_bool_parms
-{
-    int     key_size;
-    RSET    rset_l;
-    RSET    rset_r;
-    int (*cmp)(const void *p1, const void *p2);
-} rset_bool_parms;
+#error "rsbool.h no longer needed, use rset.h insted"
+
+RSET rsbool_create_and( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            RSET rset_l, RSET rset_r, 
+            void (*log_item)(int logmask, const void *p, const char *txt) );
+
+RSET rsbool_create_or( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            RSET rset_l, RSET rset_r, 
+            void (*log_item)(int logmask, const void *p, const char *txt) );
+
+RSET rsbool_create_not( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            RSET rset_l, RSET rset_r, 
+            void (*log_item)(int logmask, const void *p, const char *txt) );
 
 #ifdef __cplusplus
 }