diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 4ac9d0ebba..d283603198 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -32,11 +32,11 @@ do_abandon(
 {
 	ber_int_t		id;
 	Operation	*o;
-	Operation	**oo;
 	int rc, notfound;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n", conn->c_connid));
+	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n",
+		conn->c_connid));
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
 #endif
@@ -67,7 +67,7 @@ do_abandon(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-		   "do_abandon: conn: %d  id=%ld\n", conn->c_connid, (long) id ));
+		"do_abandon: conn: %d  id=%ld\n", conn->c_connid, (long) id ));
 #else
 	Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
 #endif
@@ -75,7 +75,7 @@ do_abandon(
 	if( id <= 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-		       "do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
+		    "do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
@@ -118,11 +118,11 @@ done:
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "do_abandon: conn: %d op=%ld %sfound\n",
-		   conn->c_connid, (long)id, notfound ? "not " : "" ));
+		"do_abandon: conn: %d op=%ld %sfound\n",
+		conn->c_connid, (long)id, notfound ? "not " : "" ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
-	       (long) id, notfound ? "not " : "", 0 );
+		(long) id, notfound ? "not " : "", 0 );
 #endif
 	return LDAP_SUCCESS;
 }