X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fabandon.c;h=b092d124f338f2c1d2713d7a0fe672af46949edd;hb=62139b6ef3634529c6d1ff726c337e685ea38cf8;hp=4ac9d0ebbaa325564fe3d8222c3e505f2f2c7e76;hpb=10961151ef251aae8fd0e8e304879f260d6b5c79;p=openldap

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 4ac9d0ebba..b092d124f3 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,7 +1,7 @@
 /* abandon.c - decode and handle an ldap abandon operation */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -32,11 +32,11 @@ do_abandon(
 {
 	ber_int_t		id;
 	Operation	*o;
-	Operation	**oo;
-	int rc, notfound;
+	int rc;
 
 #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 );
@@ -83,7 +83,6 @@ do_abandon(
 		return LDAP_SUCCESS;
 	}
 
-	notfound = 1; /* not found */
 	ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 	/*
 	 * find the operation being abandoned and set the o_abandon
@@ -91,26 +90,19 @@ do_abandon(
 	 * flag and abort the operation at a convenient time.
 	 */
 
-	STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
+	LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
 		if ( o->o_msgid == id ) {
-			ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
 			o->o_abandon = 1;
-			ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
-
-			notfound = 0;
 			goto done;
 		}
 	}
 
-	STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
-		if ( o->o_msgid == id )
-			break;
-	}
-
-	if( o != NULL ) {
-		STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
-		slap_op_free( o );
-		notfound = 0;
+	LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
+		if ( o->o_msgid == id ) {
+			LDAP_STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
+			slap_op_free( o );
+			goto done;
+		}
 	}
 
 done:
@@ -118,11 +110,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, o ? "" : "not " ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
-	       (long) id, notfound ? "not " : "", 0 );
+		(long) id, o ? "" : "not ", 0 );
 #endif
 	return LDAP_SUCCESS;
 }