Cleanup

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 0de26e84e5212a5c82d2faeec9b5b09d0594ae80..7dce6c6dd034737bee2886135679459c08c52bae 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -43,8 +43,9 @@
 void
 attr_free( Attribute *a )
 {
-       if ( a->a_nvals && a->a_nvals != a->a_vals )
+       if ( a->a_nvals && a->a_nvals != a->a_vals ) {
                ber_bvarray_free( a->a_nvals );
+       }
        ber_bvarray_free( a->a_vals );
        free( a );
 }

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 76e470efe63a388c122593fdc3266596b609ae4b..60db9aa4119ab73f03fccf55d3a1fe19eb7ce2fb 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1040,7 +1040,9 @@ static int parsePreRead (
                an[i].an_oc_exclude = 0;
                rc = slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
                if ( rc != LDAP_SUCCESS && ctrl->ldctl_iscritical ) {
-                       rs->sr_text = dummy ? dummy : "postread control: unknown attributeType";
+                       rs->sr_text = dummy
+                               ? dummy
+                               : "postread control: unknown attributeType";
                        return rc;
                }
        }
@@ -1096,7 +1098,9 @@ static int parsePostRead (
                an[i].an_oc_exclude = 0;
                rc = slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
                if ( rc != LDAP_SUCCESS && ctrl->ldctl_iscritical ) {
-                       rs->sr_text = dummy ? dummy : "postread control: unknown attributeType";
+                       rs->sr_text = dummy
+                               ? dummy
+                               : "postread control: unknown attributeType";
                        return rc;
                }
        }

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index dd91c87a1aaf17c8ebb2b0d79d020c82fd4bc6b6..ce7cbef7cd4140eca7ec04bd7306b75e85b4f82e 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -164,7 +164,8 @@ do_search(
                op->ors_attrs[i].an_desc = NULL;
                op->ors_attrs[i].an_oc = NULL;
                op->ors_attrs[i].an_oc_exclude = 0;
-               slap_bv2ad(&op->ors_attrs[i].an_name, &op->ors_attrs[i].an_desc, &dummy);
+               slap_bv2ad(&op->ors_attrs[i].an_name,
+                       &op->ors_attrs[i].an_desc, &dummy);
        }
 
        if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {