add referral check to functions elaborated by overlays

[openldap] / servers / slapd / back-ldbm / attr.c

diff --git a/servers/slapd/back-ldbm/attr.c b/servers/slapd/back-ldbm/attr.c
index 47022cfe40bcfb7e6409807a9ce781234b7cbcc7..1ce058b966f84eba84c8157d6f1dcb583514c0cb 100644 (file)
--- a/servers/slapd/back-ldbm/attr.c
+++ b/servers/slapd/back-ldbm/attr.c
@@ -1,8 +1,17 @@
 /* attr.c - backend routines for dealing with attributes */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -23,20 +32,23 @@ typedef struct ldbm_attrinfo {
 
 static int
 ainfo_type_cmp(
-       AttributeDescription *desc,
-    AttrInfo   *a
+       const void *v_desc,
+       const void *v_a
 )
 {
-       return desc - a->ai_desc;
+       const AttributeDescription *desc = v_desc;
+       const AttrInfo             *a    = v_a;
+       return SLAP_PTRCMP(desc, a->ai_desc);
 }
 
 static int
 ainfo_cmp(
-    AttrInfo   *a,
-    AttrInfo   *b
+       const void      *v_a,
+       const void      *v_b
 )
 {
-       return a->ai_desc - b->ai_desc;
+       const AttrInfo *a = v_a, *b = v_b;
+       return SLAP_PTRCMP(a->ai_desc, b->ai_desc);
 }
 
 void
@@ -47,8 +59,7 @@ attr_mask(
 {
        AttrInfo        *a;
 
-       a = (AttrInfo *) avl_find( li->li_attrs, desc,
-           (AVL_CMP) ainfo_type_cmp );
+       a = avl_find( li->li_attrs, desc, ainfo_type_cmp );
        
        *indexmask = a != NULL ? a->ai_indexmask : 0;
 }
@@ -195,7 +206,7 @@ attr_index_config(
                a->ai_indexmask = mask;
 
                rc = avl_insert( &li->li_attrs, (caddr_t) a,
-                       (AVL_CMP) ainfo_cmp, (AVL_DUP) avl_dup_error );
+                                ainfo_cmp, avl_dup_error );
 
                if( rc ) {
                        fprintf( stderr, "%s: line %d: duplicate index definition "