X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmr.c;h=5f6e496f55c4c63449faeb55a33982d2c303dfa6;hb=ed471a4d53b9bcd2cc89410743ffb4bd58b5fc05;hp=64d02b30581fd51d806e7289d3eaceafc7c67aae;hpb=2d98b19bf76b0ac01abf5df0dc2d05ae3c01e967;p=openldap

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 64d02b3058..5f6e496f55 100644
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -27,10 +27,12 @@ static MatchingRuleUse *mru_list = NULL;
 
 static int
 mr_index_cmp(
-    struct mindexrec	*mir1,
-    struct mindexrec	*mir2
+    const void	*v_mir1,
+    const void	*v_mir2
 )
 {
+	const struct mindexrec	*mir1 = v_mir1;
+	const struct mindexrec	*mir2 = v_mir2;
 	int i = mir1->mir_name.bv_len - mir2->mir_name.bv_len;
 	if (i) return i;
 	return (strcmp( mir1->mir_name.bv_val, mir2->mir_name.bv_val ));
@@ -38,10 +40,12 @@ mr_index_cmp(
 
 static int
 mr_index_name_cmp(
-    struct berval	*name,
-    struct mindexrec	*mir
+    const void	*v_name,
+    const void	*v_mir
 )
 {
+	const struct berval    *name = v_name;
+	const struct mindexrec *mir  = v_mir;
 	int i = name->bv_len - mir->mir_name.bv_len;
 	if (i) return i;
 	return (strncmp( name->bv_val, mir->mir_name.bv_val, name->bv_len ));
@@ -62,8 +66,7 @@ mr_bvfind( struct berval *mrname )
 {
 	struct mindexrec	*mir = NULL;
 
-	if ( (mir = (struct mindexrec *) avl_find( mr_index, mrname,
-	    (AVL_CMP) mr_index_name_cmp )) != NULL ) {
+	if ( (mir = avl_find( mr_index, mrname, mr_index_name_cmp )) != NULL ) {
 		return( mir->mir_mr );
 	}
 	return( NULL );
@@ -105,8 +108,7 @@ mr_insert(
 		mir->mir_name.bv_len = strlen( smr->smr_oid );
 		mir->mir_mr = smr;
 		if ( avl_insert( &mr_index, (caddr_t) mir,
-				 (AVL_CMP) mr_index_cmp,
-				 (AVL_DUP) avl_dup_error ) ) {
+		                 mr_index_cmp, avl_dup_error ) ) {
 			*err = smr->smr_oid;
 			ldap_memfree(mir);
 			return SLAP_SCHERR_MR_DUP;
@@ -122,8 +124,7 @@ mr_insert(
 			mir->mir_name.bv_len = strlen( *names );
 			mir->mir_mr = smr;
 			if ( avl_insert( &mr_index, (caddr_t) mir,
-					 (AVL_CMP) mr_index_cmp,
-					 (AVL_DUP) avl_dup_error ) ) {
+			                 mr_index_cmp, avl_dup_error ) ) {
 				*err = *names;
 				ldap_memfree(mir);
 				return SLAP_SCHERR_MR_DUP;
@@ -310,16 +311,6 @@ matching_rule_use_init( void )
 	MatchingRule	*mr;
 	MatchingRuleUse	**mru_ptr = &mru_list;
 
-#define MR_TYPE_MASK		( SLAP_MR_TYPE_MASK & ~SLAP_MR_EXT )
-#define MR_TYPE_SUBTYPE_MASK	( MR_TYPE_MASK | SLAP_MR_SUBTYPE_MASK ) 
-#if 0	/* all types regardless of EXT */
-#define MR_TYPE(x)		( (x) & MR_TYPE_MASK )
-#define MR_TYPE_SUBTYPE(x)	( (x) & MR_TYPE_SUBTYPE_MASK )
-#else	/* only those marked as EXT (as per RFC 2252) */
-#define MR_TYPE(x)		( ( (x) & SLAP_MR_EXT ) ? ( (x) & MR_TYPE_MASK ) : SLAP_MR_NONE )
-#define MR_TYPE_SUBTYPE(x)	( ( (x) & SLAP_MR_EXT ) ? ( (x) & MR_TYPE_SUBTYPE_MASK ) : SLAP_MR_NONE )
-#endif
-
 #ifdef NEW_LOGGING
 	LDAP_LOG( OPERATION, INFO, "matching_rule_use_init\n", 0, 0, 0 );
 #else
@@ -327,9 +318,6 @@ matching_rule_use_init( void )
 #endif
 
 	for ( mr = mr_list; mr; mr = mr->smr_next ) {
-		slap_mask_t	um = MR_TYPE( mr->smr_usage );
-		slap_mask_t	usm = MR_TYPE_SUBTYPE( mr->smr_usage );
-
 		AttributeType	*at;
 		MatchingRuleUse	_mru, *mru = &_mru;