upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 01:59:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#5309: Use ldap_pvt_thread_pool_setkey_x() more. Fix void** arguments.

Browse source
This commit is contained in:
Hallvard Furuseth 2008-01-07 20:10:22 +00:00
parent d0a379ed45
commit e9c2a7dcb3
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/overlays/memberof.c
View file

@ -194,7 +194,7 @@ memberof_saved_member_free( void *key, void *data )
static BerVarray
memberof_saved_member_get( Operation *op, void *keyp )
{
BerVarray vals;
void *vals;
BerVarray *key = (BerVarray *)keyp;
assert( op != NULL );
@ -204,10 +204,8 @@ memberof_saved_member_get( Operation *op, void *keyp )
*key = NULL;
} else {
ldap_pvt_thread_pool_getkey( op->o_threadctx,
key, (void **)&vals, NULL );
ldap_pvt_thread_pool_setkey( op->o_threadctx,
key, NULL, NULL );
ldap_pvt_thread_pool_setkey_x( op->o_threadctx,
key, NULL, NULL, &vals, NULL );
}
return vals;
@ -232,7 +230,7 @@ memberof_saved_member_set( Operation *op, void *keyp, BerVarray vals )
*key = saved_vals;
} else {
BerVarray old_vals = NULL;
void *old_vals = NULL;
ldap_pvt_thread_pool_setkey_x( op->o_threadctx, key,
saved_vals, memberof_saved_member_free, &old_vals, NULL );
@ -1515,7 +1513,7 @@ memberof_db_init(
ConfigReply *cr )
{
slap_overinst *on = (slap_overinst *)be->bd_info;
memberof_t tmp_mo = { 0 }, *mo;
memberof_t *mo;
mo = (memberof_t *)ch_calloc( 1, sizeof( memberof_t ) );