Remove lint

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 968c64d4cfe02576a310f88bfa57a10f349568b8..e0f40f5fe1b7979ccacc1815690d96f7d1220cb3 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,4 +1,9 @@
 /* abandon.c - decode and handle an ldap abandon operation */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
@@ -19,17 +24,22 @@
 
 #include "slap.h"
 
-void
+int
 do_abandon(
     Connection *conn,
     Operation  *op
 )
 {
-       int             id;
+       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));
+#else
        Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
+#endif
 
        /*
         * Parse the abandon request.  It looks like this:
@@ -38,27 +48,57 @@ do_abandon(
         */
 
        if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0 ,0 );
-               return;
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR, 
+                      "conn: %d do_abandon: ber_scanf failed\n",
+                      conn->c_connid ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
+#endif
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               return -1;
        }
 
-       Debug( LDAP_DEBUG_ARGS, "do_abandon: id %d\n", id, 0 ,0 );
+       if( (rc = get_ctrls( conn, op, 0 )) != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "do_abandon: get_ctrls failed\n", 0, 0 ,0 );
+               return rc;
+       } 
+
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "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
+
+       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 ));
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
+#endif
+               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
         * flag.  It's up to the backend to periodically check this
         * flag and abort the operation at a convenient time.
         */
 
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-
        for ( o = conn->c_ops; o != NULL; o = o->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 );
 
-                       goto found_it;
+                       notfound = 0;
+                       goto done;
                }
        }
 
@@ -73,12 +113,19 @@ do_abandon(
                o = *oo;
                *oo = (*oo)->o_next;
                slap_op_free( o );
-
-               goto found_it;
+               notfound = 0;
        }
 
-       Debug( LDAP_DEBUG_TRACE, "do_abandon: op not found\n", 0, 0, 0 );
-
-found_it:
+done:
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "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 );
+#endif
+       return LDAP_SUCCESS;
 }