NVALUES: fix a couple of value_find_ex() calls

[openldap] / servers / slapd / sets.h

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 1c7b8fe55e3fc34772abefce5e4f18c33801d467..6e3032bbb22377f46226c98eeec19f51594415c2 100644 (file)
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -1,20 +1,32 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
+#ifndef SLAP_SETS_H_
+#define SLAP_SETS_H_
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
 /* this routine needs to return the bervals instead of
  * plain strings, since syntax is not known.  It should
  * also return the syntax or some "comparison cookie"
  * that is used by set_filter.
  */
-typedef char **(*SET_GATHER) (void *cookie, char *name, char *attr);
+typedef BerVarray (SLAP_SET_GATHER)(
+       void *cookie, struct berval *name, struct berval *attr);
+
+LDAP_SLAPD_F (long) slap_set_size(BerVarray set);
+LDAP_SLAPD_F (void) slap_set_dispose(BerVarray set);
 
-LDAP_SLAPD_F (long) set_size (char **set);
-LDAP_SLAPD_F (void) set_dispose (char **set);
+LDAP_SLAPD_F (int) slap_set_filter(
+       SLAP_SET_GATHER gatherer,
+       void *cookie, struct berval *filter,
+       struct berval *user, struct berval *this, BerVarray *results);
 
-LDAP_SLAPD_F (int)
-set_filter (SET_GATHER gatherer, void *cookie, char *filter,
-           char *user, char *this, char ***results);
+LDAP_END_DECL
 
+#endif