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

Simpler flag/DBI checks and MDB_DEBUG

Browse source
This commit is contained in:
Hallvard Furuseth 2015-07-04 13:48:07 +02:00
parent 06df0a4655
commit b6f0179683
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/liblmdb/mdb.c
View file

@ -5082,15 +5082,12 @@ static void
mdb_cursor_pop(MDB_cursor *mc)
{
if (mc->mc_snum) {
#if MDB_DEBUG
MDB_page *top = mc->mc_pg[mc->mc_top];
#endif
DPRINTF(("popping page %"Z"u off db %d cursor %p",
mc->mc_pg[mc->mc_top]->mp_pgno, DDBI(mc), (void *) mc));
mc->mc_snum--;
if (mc->mc_snum)
mc->mc_top--;
DPRINTF(("popped page %"Z"u off db %d cursor %p", top->mp_pgno,
DDBI(mc), (void *) mc));
}
}
@ -8556,7 +8553,7 @@ mdb_put(MDB_txn *txn, MDB_dbi dbi,
if (!key || !data || dbi == FREE_DBI || !TXN_DBI_EXIST(txn, dbi))
return EINVAL;
if ((flags & (MDB_NOOVERWRITE|MDB_NODUPDATA|MDB_RESERVE|MDB_APPEND|MDB_APPENDDUP)) != flags)
if (flags & ~(MDB_NOOVERWRITE|MDB_NODUPDATA|MDB_RESERVE|MDB_APPEND|MDB_APPENDDUP))
return EINVAL;
mdb_cursor_init(&mc, txn, dbi, &mx);
@ -9126,7 +9123,7 @@ mdb_env_copy(MDB_env *env, const char *path)
int ESECT
mdb_env_set_flags(MDB_env *env, unsigned int flag, int onoff)
{
if ((flag & CHANGEABLE) != flag)
if (flag & ~CHANGEABLE)
return EINVAL;
if (onoff)
env->me_flags |= flag;
@ -9275,7 +9272,7 @@ int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *db
unsigned int unused = 0, seq;
size_t len;
if ((flags & VALID_FLAGS) != flags)
if (flags & ~VALID_FLAGS)
return EINVAL;
if (txn->mt_flags & MDB_TXN_ERROR)
return MDB_BAD_TXN;