upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-09 22:04:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix callback handling

Browse source
This commit is contained in:
Howard Chu 2006-12-18 00:27:38 +00:00
parent ccf7b0fb04
commit 23423cd086
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
servers/slapd/overlays/rwm.c
View file

@ -42,16 +42,6 @@ typedef struct rwm_op_cb {
rwm_op_state ros;
} rwm_op_cb;
static rwm_op_cb rwm_cb;
static void
rwm_keyfree(
void *key,
void *data )
{
ber_memfree_x( data, NULL );
}
static int
rwm_op_cleanup( Operation *op, SlapReply *rs )
{
@ -97,6 +87,8 @@ rwm_op_cleanup( Operation *op, SlapReply *rs )
break;
default: break;
}
op->o_callback = op->o_callback->sc_next;
op->o_tmpfree( cb, op->o_tmpmemctx );
}
return SLAP_CB_CONTINUE;
@ -107,17 +99,7 @@ rwm_callback_get( Operation *op, SlapReply *rs )
{
rwm_op_cb *roc = NULL;
if ( op->o_threadctx == NULL ) {
roc = &rwm_cb;
} else {
ldap_pvt_thread_pool_getkey( op->o_threadctx,
rwm_keyfree, (void *)&roc, NULL );
if ( roc == NULL ) {
roc = ch_malloc( sizeof( struct rwm_op_cb ));
ldap_pvt_thread_pool_setkey( op->o_threadctx,
rwm_keyfree, roc, rwm_keyfree );
}
}
roc = op->o_tmpalloc( sizeof( struct rwm_op_cb ), op->o_tmpmemctx );
roc->cb.sc_cleanup = rwm_op_cleanup;
roc->cb.sc_response = NULL;
roc->cb.sc_next = op->o_callback;