Converted ch_malloc and ch_calloc calls to SLAP_MALLOC and SLAP_CALLOC.

[openldap] / servers / slapd / sets.h

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 72be10f3cac0de9771f5d1c099e0e42c4ad50fa4..569efa90b60234d9fa740b1a0a5fbe69cb6f01ce 100644 (file)
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -4,13 +4,20 @@
  * 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 BerVarray (SLAP_SET_GATHER)(
-       void *cookie, char *name, struct berval *attr);
+       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);
@@ -18,5 +25,8 @@ LDAP_SLAPD_F (void) slap_set_dispose (BerVarray set);
 LDAP_SLAPD_F (int)
 slap_set_filter (SLAP_SET_GATHER gatherer,
        void *cookie, struct berval *filter,
-       char *user, char *this, BerVarray *results);
+       struct berval *user, struct berval *this, BerVarray *results);
+
+LDAP_END_DECL
 
+#endif