Cast ctype.h char arguments to unsigned char

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index d2e9fd05f7c63bc0b347a4c310241273160b2103..13bb5cf590bbcc05e6f5adf1666035e004e2244a 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,13 +69,13 @@ slap_op_free( Operation *op )
                ber_free( op->o_ber, 1 );
        }
        if ( !BER_BVISNULL( &op->o_dn ) ) {
-               free( op->o_dn.bv_val );
+               ch_free( op->o_dn.bv_val );
        }
        if ( !BER_BVISNULL( &op->o_ndn ) ) {
-               free( op->o_ndn.bv_val );
+               ch_free( op->o_ndn.bv_val );
        }
        if ( !BER_BVISNULL( &op->o_authmech ) ) {
-               free( op->o_authmech.bv_val );
+               ch_free( op->o_authmech.bv_val );
        }
        if ( op->o_ctrls != NULL ) {
                slap_free_ctrls( op, op->o_ctrls );
@@ -97,8 +97,7 @@ slap_op_free( Operation *op )
        }
 
 #if defined( LDAP_SLAPI )
-       if ( op->o_pb != NULL ) {
-               slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+       if ( slapi_plugins_used ) {
                slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */
@@ -113,13 +112,27 @@ slap_op_free( Operation *op )
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 }
 
+void
+slap_op_time(time_t *t, int *nop)
+{
+       *t = slap_get_time();
+       ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+       if ( *t == last_time ) {
+               *nop = ++last_incr;
+       } else {
+               last_time = *t;
+               last_incr = 0;
+               *nop = 0;
+       }
+       ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
+}
+
 Operation *
 slap_op_alloc(
     BerElement         *ber,
     ber_int_t  msgid,
     ber_tag_t  tag,
-    ber_int_t  id
-)
+    ber_int_t  id )
 {
        Operation       *op;
 
@@ -140,19 +153,12 @@ slap_op_alloc(
        op->o_msgid = msgid;
        op->o_tag = tag;
 
-       op->o_time = slap_get_time();
-       if ( op->o_time == last_time ) {
-               op->o_tincr = ++last_incr;
-       } else {
-               last_time = op->o_time;
-               last_incr = 0;  /* o_tincr is alredy zero */
-       }
+       slap_op_time( &op->o_time, &op->o_tincr );
        op->o_opid = id;
        op->o_res_ber = NULL;
 
 #if defined( LDAP_SLAPI )
        if ( slapi_plugins_used ) {
-               op->o_pb = slapi_pblock_new();
                slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */