Added SLAP_TOOL_READMAIN and SLAP_TOOL_READONLY slapMode flags. The rw

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

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index c4d9ef7831aec3d152ef6e7e452a3a1bea0c3b24..65a8cc215d55900ab8981d220dbc74f4aca905c6 100644 (file)
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -1,7 +1,7 @@
 /* attr.c - backend routines for dealing with attributes */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -23,43 +23,45 @@ typedef struct bdb_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
 bdb_attr_mask(
-    struct bdb_info    *bdb,
-    AttributeDescription *desc,
-    slap_mask_t *indexmask )
+       struct bdb_info *bdb,
+       AttributeDescription *desc,
+       slap_mask_t *indexmask )
 {
        AttrInfo        *a;
 
-       a = (AttrInfo *) avl_find( bdb->bi_attrs, desc,
-           (AVL_CMP) ainfo_type_cmp );
+       a = (AttrInfo *) avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
        
        *indexmask = a != NULL ? a->ai_indexmask : 0;
 }
 
 int
 bdb_attr_index_config(
-    struct bdb_info    *bdb,
-    const char         *fname,
-    int                        lineno,
-    int                        argc,
-    char               **argv )
+       struct bdb_info *bdb,
+       const char              *fname,
+       int                     lineno,
+       int                     argc,
+       char            **argv )
 {
        int rc;
        int     i;
@@ -67,7 +69,7 @@ bdb_attr_index_config(
        char **attrs;
        char **indexes = NULL;
 
-       attrs = str2charray( argv[0], "," );
+       attrs = ldap_str2charray( argv[0], "," );
 
        if( attrs == NULL ) {
                fprintf( stderr, "%s: line %d: "
@@ -77,7 +79,7 @@ bdb_attr_index_config(
        }
 
        if ( argc > 1 ) {
-               indexes = str2charray( argv[1], "," );
+               indexes = ldap_str2charray( argv[1], "," );
 
                if( indexes == NULL ) {
                        fprintf( stderr, "%s: line %d: "
@@ -108,7 +110,7 @@ bdb_attr_index_config(
                }
        }
 
-    if( !mask ) {
+       if( !mask ) {
                fprintf( stderr, "%s: line %d: "
                        "no indexes selected\n",
                        fname, lineno );
@@ -181,11 +183,11 @@ bdb_attr_index_config(
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "attr_index_config: index %s 0x%04x\n",
-                          ad->ad_cname.bv_val, mask ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "attr_index_config: index %s 0x%04lx\n",
+                       ad->ad_cname.bv_val, mask, 0 );
 #else
-               Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04x\n",
+               Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
                        ad->ad_cname.bv_val, mask, 0 ); 
 #endif
 
@@ -194,19 +196,19 @@ bdb_attr_index_config(
                a->ai_indexmask = mask;
 
                rc = avl_insert( &bdb->bi_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 "
                                "for attr \"%s\" (ignored)\n",
-                           fname, lineno, attrs[i] );
+                               fname, lineno, attrs[i] );
 
                        return LDAP_PARAM_ERROR;
                }
        }
 
-       charray_free( attrs );
-       if ( indexes != NULL ) charray_free( indexes );
+       ldap_charray_free( attrs );
+       if ( indexes != NULL ) ldap_charray_free( indexes );
 
        return LDAP_SUCCESS;
 }