cleanup

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 72340523eee60eb94160b210e55ebc05fbb218da..8b006652f3e4217a17dc88e184ba48b684ce4d67 100644 (file)
--- 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";