From: Howard Chu <hyc@openldap.org>
Date: Wed, 28 Sep 2005 15:39:33 +0000 (+0000)
Subject: ITS#4015 from HEAD silence pointer/integer size warnings
X-Git-Tag: OPENLDAP_REL_ENG_2_2_29~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd7d3d977d1458aa93b4073f6803bd69479b8286;p=thirdparty%2Fopenldap.git

ITS#4015 from HEAD silence pointer/integer size warnings
---

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index a7581ebd09..bbc56e3a33 100644
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -1273,7 +1273,7 @@ static void
 bdb_locker_id_free( void *key, void *data )
 {
 	DB_ENV *env = key;
-	int lockid = (int) data;
+	u_int32_t lockid = (long) data;
 	int rc;
 
 	rc = XLOCK_ID_FREE( env, lockid );
@@ -1293,7 +1293,8 @@ bdb_locker_id_free( void *key, void *data )
 int
 bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
 {
-	int i, rc, lockid;
+	int i, rc;
+	u_int32_t lockid;
 	void *data;
 	void *ctx;
 
@@ -1320,7 +1321,7 @@ bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
 		if ( rc != 0) {
 			return rc;
 		}
-		data = (void *)lockid;
+		data = (void *)((long)lockid);
 		if ( ( rc = ldap_pvt_thread_pool_setkey( ctx, env,
 			data, bdb_locker_id_free ) ) ) {
 			XLOCK_ID_FREE( env, lockid );
@@ -1330,7 +1331,7 @@ bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
 			return rc;
 		}
 	} else {
-		lockid = (int)data;
+		lockid = (long)data;
 	}
 	*locker = lockid;
 	return 0;