mirror of
https://github.com/isar/libmdbx.git
synced 2025-01-04 17:04:13 +08:00
mdbx: fix Coverity warnings (minor).
Change-Id: I15c6c707cdeef55c9ce82fe7d5ed0d86224391f5
This commit is contained in:
parent
d1e2749337
commit
398b90fb1c
@ -9206,9 +9206,8 @@ int __cold mdbx_env_close_ex(MDBX_env *env, int dont_sync) {
|
||||
env->me_flags |= MDBX_FATAL_ERROR;
|
||||
#endif /* MDBX_TXN_CHECKPID */
|
||||
|
||||
if ((env->me_flags & (MDBX_RDONLY | MDBX_FATAL_ERROR)) == 0) {
|
||||
if (env->me_txn0 && env->me_txn0->mt_owner &&
|
||||
env->me_txn0->mt_owner != mdbx_thread_self())
|
||||
if ((env->me_flags & (MDBX_RDONLY | MDBX_FATAL_ERROR)) == 0 && env->me_txn0) {
|
||||
if (env->me_txn0->mt_owner && env->me_txn0->mt_owner != mdbx_thread_self())
|
||||
return MDBX_BUSY;
|
||||
if (!dont_sync) {
|
||||
#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);
|
||||
return rc;
|
||||
}
|
||||
} else {
|
||||
} else if (likely(right)) {
|
||||
/* try merge with right */
|
||||
mdbx_cassert(mc, page_numkeys(right) >= minkeys);
|
||||
mn.mc_pg[mn.mc_top] = right;
|
||||
|
Loading…
x
Reference in New Issue
Block a user