From 74bfae5c22380b9c4d0597afc2f7197633d19cee Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 14 May 2004 04:48:44 +0000 Subject: [PATCH] cleanup --- servers/slapd/schema.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c index 72340523ee..8b006652f3 100644 --- a/servers/slapd/schema.c +++ b/servers/slapd/schema.c @@ -67,8 +67,7 @@ schema_info( Entry **entry, const char **text ) vals[0].bv_val = "subentry"; vals[0].bv_len = sizeof("subentry")-1; - if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) ) - { + if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) ) { /* Out of memory, do something about it */ entry_free( e ); *text = "out of memory"; @@ -84,8 +83,7 @@ schema_info( Entry **entry, const char **text ) vals[3].bv_val = "extensibleObject"; vals[3].bv_len = sizeof("extensibleObject")-1; vals[4].bv_val = NULL; - if( attr_merge( e, ad_objectClass, vals, vals ) ) - { + if( attr_merge( e, ad_objectClass, vals, vals ) ) { /* Out of memory, do something about it */ entry_free( e ); *text = "out of memory"; @@ -121,8 +119,7 @@ schema_info( Entry **entry, const char **text ) nvals[0].bv_len = global_schemandn.bv_len - (nvals[0].bv_val - global_schemandn.bv_val); - if( attr_merge_one( e, desc, vals, nvals ) ) - { + if( attr_merge_one( e, desc, vals, nvals ) ) { /* Out of memory, do something about it */ entry_free( e ); *text = "out of memory"; @@ -162,15 +159,13 @@ schema_info( Entry **entry, const char **text ) vals[0].bv_val = timebuf; vals[0].bv_len = strlen( timebuf ); - if( attr_merge_one( e, ad_createTimestamp, vals, vals ) ) - { + if( attr_merge_one( e, ad_createTimestamp, vals, vals ) ) { /* Out of memory, do something about it */ entry_free( e ); *text = "out of memory"; return LDAP_OTHER; } - if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) ) - { + if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) ) { /* Out of memory, do something about it */ entry_free( e ); *text = "out of memory"; -- 2.39.5