X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fattr.c;h=c05cfc393390b46624cc01f5b3531c55d89ef096;hb=02fb60d3dad11f9ee46feb6ba3eb9ad96dde0c48;hp=c4d9ef7831aec3d152ef6e7e452a3a1bea0c3b24;hpb=a3ded4782e30182875ca26ade6dafa437b109cec;p=openldap diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c index c4d9ef7831..c05cfc3933 100644 --- 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-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -24,7 +24,7 @@ typedef struct bdb_attrinfo { static int ainfo_type_cmp( AttributeDescription *desc, - AttrInfo *a + AttrInfo *a ) { return desc - a->ai_desc; @@ -32,8 +32,8 @@ ainfo_type_cmp( static int ainfo_cmp( - AttrInfo *a, - AttrInfo *b + AttrInfo *a, + AttrInfo *b ) { return a->ai_desc - b->ai_desc; @@ -41,25 +41,25 @@ ainfo_cmp( 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 ); + (AVL_CMP) 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; @@ -108,7 +108,7 @@ bdb_attr_index_config( } } - if( !mask ) { + if( !mask ) { fprintf( stderr, "%s: line %d: " "no indexes selected\n", fname, lineno ); @@ -182,10 +182,10 @@ 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 )); + "attr_index_config: index %s 0x%04lx\n", + ad->ad_cname.bv_val, mask )); #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 @@ -199,7 +199,7 @@ bdb_attr_index_config( 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; }