X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=39c2594189c7ab44906db93556891c6942e66392;hb=2f9b89b4afc2f8fc68ab3f2d1122c92ec53db926;hp=a4ef93f7b37cd9f21aee801a742d3145b6da401e;hpb=92481f7057f64adae2b58bb0761d5e1a95dcbca5;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index a4ef93f7b3..39c2594189 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -23,13 +23,15 @@
 #include "slap.h"
 
 #ifdef LDAP_DEBUG
-static void at_index_print( void ) {};
+static void at_index_print( void ) 
+{
+}
 #endif
 
 void
 attr_free( Attribute *a )
 {
-	bvarray_free( a->a_vals );
+	ber_bvarray_free( a->a_vals );
 	free( a );
 }
 
@@ -110,13 +112,12 @@ int
 attr_merge(
 	Entry		*e,
 	AttributeDescription *desc,
-	BVarray	vals )
+	BerVarray	vals )
 {
 	Attribute	**a;
 
 	for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
-		if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-		{
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
 			break;
 		}
 	}
@@ -163,8 +164,7 @@ attr_find(
 )
 {
 	for ( ; a != NULL; a = a->a_next ) {
-		if ( ad_cmp( a->a_desc, desc ) == 0 )
-		{
+		if ( ad_cmp( a->a_desc, desc ) == 0 ) {
 			return( a );
 		}
 	}
@@ -188,8 +188,7 @@ attr_delete(
 	Attribute	**a;
 
 	for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
-		if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-		{
+		if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
 			Attribute	*save = *a;
 			*a = (*a)->a_next;
 			attr_free( save );