upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 12:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bdb_locker_id, bdb_locker_id_free: BerkeleyDB lock ids are u_int32_t, not int.

Browse source
This commit is contained in:
Hallvard Furuseth 2005-07-27 12:19:16 +00:00
parent 38f10e1f63
commit 3226cdf2a3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/back-bdb/cache.c
View file

@ -1318,15 +1318,15 @@ static void
bdb_locker_id_free( void *key, void *data )
{
DB_ENV *env = key;
int lockid = (int) data;
u_int32_t lockid = (u_int32_t) data;
int rc;
rc = XLOCK_ID_FREE( env, lockid );
if ( rc == EINVAL ) {
DB_LOCKREQ lr;
Debug( LDAP_DEBUG_ANY,
"bdb_locker_id_free: %d err %s(%d)\n",
lockid, db_strerror(rc), rc );
"bdb_locker_id_free: %lu err %s(%d)\n",
(unsigned long) lockid, db_strerror(rc), rc );
/* release all locks held by this locker. */
lr.op = DB_LOCK_PUT_ALL;
lr.obj = NULL;
@ -1336,9 +1336,10 @@ bdb_locker_id_free( void *key, void *data )
}
int
bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
bdb_locker_id( Operation *op, DB_ENV *env, u_int32_t *locker )
{
int i, rc, lockid;
int i, rc;
u_int32_t lockid;
void *data;
void *ctx;
@ -1375,12 +1376,12 @@ bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
return rc;
}
} else {
lockid = (int)data;
lockid = (u_int32_t) data;
}
*locker = lockid;
return 0;
}
#endif
#endif /* BDB_REUSE_LOCKERS */
void
bdb_cache_delete_entry(

2
servers/slapd/back-bdb/proto-bdb.h
View file

@ -522,7 +522,7 @@ int bdb_cache_entry_db_unlock(
#ifdef BDB_REUSE_LOCKERS
#define bdb_locker_id BDB_SYMBOL(locker_id)
int bdb_locker_id( Operation *op, DB_ENV *env, int *locker );
int bdb_locker_id( Operation *op, DB_ENV *env, u_int32_t *locker );
#define LOCK_ID_FREE(env, locker) ((void)0)
#define LOCK_ID(env, locker) bdb_locker_id(op, env, locker)