ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 22:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix Coverity warnings (minor).

Browse Source 
Change-Id: I15c6c707cdeef55c9ce82fe7d5ed0d86224391f5
This commit is contained in:
Leonid Yuriev 2019-12-03 15:07:07 +03:00
parent d1e2749337
commit 398b90fb1c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/elements/core.c
View File

@ -9206,9 +9206,8 @@ int __cold mdbx_env_close_ex(MDBX_env *env, int dont_sync) {
env->me_flags |= MDBX_FATAL_ERROR; env->me_flags |= MDBX_FATAL_ERROR;
#endif /* MDBX_TXN_CHECKPID */ #endif /* MDBX_TXN_CHECKPID */
if ((env->me_flags & (MDBX_RDONLY | MDBX_FATAL_ERROR)) == 0) { if ((env->me_flags & (MDBX_RDONLY | MDBX_FATAL_ERROR)) == 0 && env->me_txn0) {
if (env->me_txn0 && env->me_txn0->mt_owner && if (env->me_txn0->mt_owner && env->me_txn0->mt_owner != mdbx_thread_self())
env->me_txn0->mt_owner != mdbx_thread_self())
return MDBX_BUSY; return MDBX_BUSY;
if (!dont_sync) { if (!dont_sync) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@ -12884,7 +12883,7 @@ static int mdbx_rebalance(MDBX_cursor *mc) {
mdbx_cassert(mc, rc || page_numkeys(mc->mc_pg[mc->mc_top]) >= minkeys); mdbx_cassert(mc, rc || page_numkeys(mc->mc_pg[mc->mc_top]) >= minkeys);
return rc; return rc;
} }
} else { } else if (likely(right)) {
/* try merge with right */ /* try merge with right */
mdbx_cassert(mc, page_numkeys(right) >= minkeys); mdbx_cassert(mc, page_numkeys(right) >= minkeys);
mn.mc_pg[mn.mc_top] = right; mn.mc_pg[mn.mc_top] = right;