Commit d6fbe1c7 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#6361 remove asserts

parent fdf55ac8
......@@ -783,7 +783,9 @@ void connection_closing( Connection *c, const char *why )
{
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state == SLAP_C_USED );
if ( c->c_struct_state != SLAP_C_USED ) return;
assert( c->c_conn_state != SLAP_C_INVALID );
/* c_mutex must be locked by caller */
......@@ -816,7 +818,9 @@ connection_close( Connection *c )
{
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state == SLAP_C_USED );
if ( c->c_struct_state != SLAP_C_USED ) return;
assert( c->c_conn_state == SLAP_C_CLOSING );
/* NOTE: c_mutex should be locked by caller */
......
......@@ -989,13 +989,17 @@ slapd_clr_read( ber_socket_t s, int wake )
void
slapd_set_read( ber_socket_t s, int wake )
{
int do_wake = 1;
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
assert( SLAP_SOCK_IS_ACTIVE( s ));
if (!SLAP_SOCK_IS_READ( s )) SLAP_SOCK_SET_READ( s );
if( SLAP_SOCK_IS_ACTIVE( s ) && !SLAP_SOCK_IS_READ( s )) {
SLAP_SOCK_SET_READ( s );
} else {
do_wake = 0;
}
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
WAKE_LISTENER(wake);
if ( do_wake )
WAKE_LISTENER(wake);
}
time_t
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment