From e9c2a7dcb373d6983c492ea0f45e3d1f14bb5563 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 7 Jan 2008 20:10:22 +0000 Subject: [PATCH] ITS#5309: Use ldap_pvt_thread_pool_setkey_x() more. Fix void** arguments. --- servers/slapd/overlays/memberof.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c index f198f71766..064024b1be 100644 --- a/servers/slapd/overlays/memberof.c +++ b/servers/slapd/overlays/memberof.c @@ -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 ) ); -- 2.39.5