From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Mon, 20 Dec 2004 20:28:30 +0000 (+0000)
Subject: misc fix for the component indexing commit
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=35c19ef342708f8350bba7641be33f764887bcec;p=openldap

misc fix for the component indexing commit
---

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index b5df633b66..3947aeab72 100644
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -56,7 +56,10 @@ ainfo_cmp(
 
 #ifdef LDAP_COMP_MATCH
 void
-bdb_attr_comp_ref( struct bdb_info *bdb, AttributeDescription *desc, ComponentReference** cr )
+bdb_attr_comp_ref(
+	struct bdb_info *bdb,
+	AttributeDescription *desc,
+	ComponentReference** cr )
 {
 	AttrInfo	*a;
 
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index d1ab50e2ea..73bc1dc636 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -58,7 +58,7 @@ static int list_candidates(
 	ID *stack );
 
 #ifdef LDAP_COMP_MATCH
-int
+static int
 ext_candidates(
         Operation *op,
         MatchingRuleAssertion *mra,
@@ -247,7 +247,7 @@ comp_list_candidates(
 	return rc;
 }
 
-int
+static int
 comp_equality_candidates (
         Operation *op,
         MatchingRuleAssertion *mra,
@@ -352,7 +352,7 @@ comp_equality_candidates (
         return( rc );
 }
 
-int
+static int
 comp_candidates (
 	Operation *op,
 	MatchingRuleAssertion *mra,
@@ -399,7 +399,7 @@ comp_candidates (
 	return( rc );
 }
 
-int
+static int
 ext_candidates(
         Operation *op,
         MatchingRuleAssertion *mra,
diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index 8480db421e..672ab7804a 100644
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -34,6 +34,13 @@ LDAP_BEGIN_DECL
 #define bdb_attr_index_config		BDB_SYMBOL(attr_index_config)
 #define bdb_attr_index_destroy		BDB_SYMBOL(attr_index_destroy)
 
+#ifdef LDAP_COMP_MATCH
+#define bdb_attr_comp_ref			BDB_SYMBOL(attr_comp_ref)
+void bdb_attr_comp_ref( struct bdb_info *bdb,
+	AttributeDescription *desc,
+	ComponentReference **cr );
+#endif
+
 void bdb_attr_mask( struct bdb_info *bdb,
 	AttributeDescription *desc,
 	slap_mask_t *indexmask );