From 4cb5d637d480724fb8d176024cf8a410e6b8b32b Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 4 Jul 2015 13:48:07 +0200
Subject: [PATCH] lmdb: Simpler flag/DBI checks and MDB_DEBUG.

Change-Id: I37a00fcc23f2060538ab4378f204ae0efcdb59ea
---
 mdb.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/mdb.c b/mdb.c
index 8a2da5cc..d928b09c 100644
--- a/mdb.c
+++ b/mdb.c
@@ -5012,13 +5012,12 @@ static void
 mdb_cursor_pop(MDB_cursor *mc)
 {
 	if (mc->mc_snum) {
-		MDB_page	*top = mc->mc_pg[mc->mc_top];
+		mdb_debug("popped page %zu 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--;
-
-		mdb_debug("popped page %zu off db %d cursor %p", top->mp_pgno,
-			DDBI(mc), (void *) mc);
 	}
 }
 
@@ -8404,7 +8403,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);
@@ -8936,7 +8935,7 @@ mdb_env_copy(MDB_env *env, const char *path)
 int ESECT
 mdb_env_set_flags(MDB_env *env, unsigned flag, int onoff)
 {
-	if ((flag & CHANGEABLE) != flag)
+	if (flag & ~CHANGEABLE)
 		return EINVAL;
 	if (onoff)
 		env->me_flags |= flag;
@@ -9108,7 +9107,7 @@ int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned flags, MDB_dbi *dbi)
 	unsigned 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;