From 4bcaabecf5410065ba17d64d0fa95d2844aa5582 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 21 Sep 2011 17:21:48 -0700 Subject: [PATCH] assert cleanup --- libraries/libmdb/mdb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c index ae2e77c..04f38b3 100644 --- a/libraries/libmdb/mdb.c +++ b/libraries/libmdb/mdb.c @@ -1121,7 +1121,7 @@ mdb_page_alloc(MDB_cursor *mc, int num) if (pgno == P_INVALID) { /* DB size is maxed out */ if (txn->mt_next_pgno + num >= txn->mt_env->me_maxpg) { - assert(txn->mt_next_pgno + num < txn->mt_env->me_maxpg); + DPRINTF("DB size maxed out"); return NULL; } } @@ -4824,7 +4824,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst) if (IS_BRANCH(csrc->mc_pg[csrc->mc_top])) { MDB_val nullkey; nullkey.mv_size = 0; - assert(mdb_update_key(csrc->mc_pg[csrc->mc_top], 0, &nullkey) == MDB_SUCCESS); + rc = mdb_update_key(csrc->mc_pg[csrc->mc_top], 0, &nullkey); + assert(rc == MDB_SUCCESS); } } @@ -4846,7 +4847,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst) if (IS_BRANCH(cdst->mc_pg[cdst->mc_top])) { MDB_val nullkey; nullkey.mv_size = 0; - assert(mdb_update_key(cdst->mc_pg[cdst->mc_top], 0, &nullkey) == MDB_SUCCESS); + rc = mdb_update_key(cdst->mc_pg[cdst->mc_top], 0, &nullkey); + assert(rc == MDB_SUCCESS); } } -- 2.7.4