cleanup

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index cb1e5ccb6c8918187b236ff478fe1aa7914c2d3c..69ca9f143980188a27a6014b8e7fa686f0af4278 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -142,8 +142,8 @@ attr_merge(
        Entry           *e,
        AttributeDescription *desc,
        BerVarray       vals,
-       BerVarray       nvals
-) {
+       BerVarray       nvals )
+{
        int rc;
 
        Attribute       **a;
@@ -176,8 +176,8 @@ attr_merge_normalize(
        Entry           *e,
        AttributeDescription *desc,
        BerVarray       vals,
-       void     *memctx
-) {
+       void     *memctx )
+{
        BerVarray       nvals = NULL;
        int             rc;
 
@@ -218,8 +218,8 @@ attr_merge_one(
        Entry           *e,
        AttributeDescription *desc,
        struct berval   *val,
-       struct berval   *nval
-) {
+       struct berval   *nval )
+{
        int rc;
        Attribute       **a;
 
@@ -250,8 +250,8 @@ attr_merge_normalize_one(
        Entry           *e,
        AttributeDescription *desc,
        struct berval   *val,
-       void            *memctx
-) {
+       void            *memctx )
+{
        struct berval   nval;
        struct berval   *nvalp;
        int             rc;
@@ -288,8 +288,7 @@ attr_merge_normalize_one(
 Attribute *
 attrs_find(
     Attribute  *a,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        for ( ; a != NULL; a = a->a_next ) {
                if ( is_ad_subtype( a->a_desc, desc ) ) {
@@ -307,8 +306,7 @@ attrs_find(
 Attribute *
 attr_find(
     Attribute  *a,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        for ( ; a != NULL; a = a->a_next ) {
                if ( ad_cmp( a->a_desc, desc ) == 0 ) {
@@ -329,8 +327,7 @@ attr_find(
 int
 attr_delete(
     Attribute  **attrs,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        Attribute       **a;
 

diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index e6790c258f66297b9dce1d493fe752e9a10fcfb6..8a40ef301a46fc5904e715034e36832c0f1f66ff 100644 (file)
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -107,7 +107,7 @@ modify_add_values(
                 */
                int             rc;
 
-               for ( matched = 0, i = 0; a->a_vals[ i ].bv_val; i++ ) {
+               for ( matched = 0, i = 0; a->a_vals[i].bv_val; i++ ) {
                        int     match;
 
                        if( mod->sm_nvalues ) {

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index bbbd318e978cfa0f4a919bb306c661acd229923a..893803def992d74cba5d292812aa852b12c9c1db 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -41,8 +41,7 @@
 int
 value_add( 
     BerVarray *vals,
-    BerVarray addvals
-)
+    BerVarray addvals )
 {
        int     n, nn;
        BerVarray v2;
@@ -96,8 +95,7 @@ value_add(
 int
 value_add_one( 
     BerVarray *vals,
-    struct berval *addval
-)
+    struct berval *addval )
 {
        int     n;
        BerVarray v2;