From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 8 Apr 2004 07:04:34 +0000 (+0000)
Subject: cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~82
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6b410330ed044d6949934d5cc7b57124464e9aaa;p=openldap

cleanup
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index cb1e5ccb6c..69ca9f1439 100644
--- 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 e6790c258f..8a40ef301a 100644
--- 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 bbbd318e97..893803def9 100644
--- 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;