Change 'unsigned long len' to ber_len_t in get_filter()

[openldap] / servers / slapd / back-bdb2 / abandon.c

diff --git a/servers/slapd/back-bdb2/abandon.c b/servers/slapd/back-bdb2/abandon.c
index 1d9c1e9dafcd3dd4992e0a36979e21536cb3c206..8e3d70fecce338909e9bda2d62db425ef519e1bb 100644 (file)
--- a/servers/slapd/back-bdb2/abandon.c
+++ b/servers/slapd/back-bdb2/abandon.c
@@ -3,10 +3,10 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <sys/time.h>
-#include <unistd.h>
 
 #include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
 
 #include "slap.h"
 #include "back-bdb2.h"
@@ -15,7 +15,7 @@
 /*ARGSUSED*/
 static int
 bdb2i_back_abandon_internal(
-       Backend    *be,
+       BackendDB    *be,
        Connection *c,
        Operation  *o,
        int        msgid )
@@ -26,28 +26,19 @@ bdb2i_back_abandon_internal(
 
 int
 bdb2_back_abandon(
-       Backend    *be,
-       Connection *c,
-       Operation  *o,
+       BackendDB    *be,
+       Connection *conn,
+       Operation  *op,
        int        msgid )
 {
-       struct timeval  time1, time2;
-       char   *elapsed_time;
-       int    ret;
-
-       gettimeofday( &time1, NULL );
-
-       ret = bdb2i_back_abandon_internal( be, c, o, msgid );
+       struct timeval  time1;
+       int             ret;
 
-       if ( bdb2i_do_timing ) {
+       bdb2i_start_timing( be->bd_info, &time1 );
 
-               gettimeofday( &time2, NULL);
-               elapsed_time = bdb2i_elapsed( time1, time2 );
-               Debug( LDAP_DEBUG_ANY, "ABND elapsed=%s\n",
-                               elapsed_time, 0, 0 );
-               free( elapsed_time );
+       ret = bdb2i_back_abandon_internal( be, conn, op, msgid );
 
-       }
+       bdb2i_stop_timing( be->bd_info, time1, "ABND", conn, op );
 
        return( ret );
 }