From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 13 Dec 2003 18:57:00 +0000 (+0000)
Subject: cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~201
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4bedf015f0cc1e7e280b2419ec416095a7d55775;p=openldap

cleanup
---

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 4058b43eba..47b0a32e7f 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -672,16 +672,20 @@ static int doPreAddPluginFNs( Operation *op )
 		 * entire operation.
 		 */
 #ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, INFO, "do_add: add preoperation plugin failed\n",
-				0, 0, 0);
+		LDAP_LOG( OPERATION, INFO,
+			"do_add: add preoperation plugin failed\n",
+			0, 0, 0);
 #else
-		Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
-				0, 0, 0);
-		if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) ||
-		     rc == LDAP_SUCCESS ) {
+		Debug(LDAP_DEBUG_TRACE,
+			"do_add: add preoperation plugin failed.\n",
+			0, 0, 0);
+#endif
+
+		if (( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE,
+			(void *)&rc ) != 0 ) || rc == LDAP_SUCCESS )
+		{
 			rc = LDAP_OTHER;
 		}
-#endif
 	} else {
 		rc = LDAP_SUCCESS;
 	}
@@ -696,11 +700,13 @@ static void doPostAddPluginFNs( Operation *op )
 	rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
 	if ( rc < 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, INFO, "do_add: add postoperation plugin failed\n",
-				0, 0, 0);
+		LDAP_LOG( OPERATION, INFO,
+			"do_add: add postoperation plugin failed\n",
+			0, 0, 0);
 #else
-		Debug(LDAP_DEBUG_TRACE, "do_add: add postoperation plugin failed.\n",
-				0, 0, 0);
+		Debug(LDAP_DEBUG_TRACE,
+			"do_add: add postoperation plugin failed\n",
+			0, 0, 0);
 #endif
 	}
 }
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b0f1c8f3d0..04ab269160 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1388,13 +1388,12 @@ int connection_read(ber_socket_t s)
 #define CONNECTION_INPUT_LOOP 1
 /* #define	DATA_READY_LOOP 1 */
 
-	do
-	{
+	do {
 		/* How do we do this without getting into a busy loop ? */
 		rc = connection_input( c );
 	}
 #ifdef DATA_READY_LOOP
-	while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ) );
+	while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ));
 #elif CONNECTION_INPUT_LOOP
 	while(!rc);
 #else