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

mdbx: fix Coverity warnings (minor).

Browse Source 
Change-Id: I8636560583c11eeaa6d37ba9f7f66e1afc2232da
This commit is contained in:
Leonid Yuriev 2019-10-21 11:46:17 +03:00
parent 0137d1f303
commit 411ed3e578
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/elements/core.c
View File

@ -2500,7 +2500,7 @@ static __hot int mdbx_page_loose(MDBX_txn *txn, MDBX_page *mp) {
mdbx_debug("loosen page %" PRIaPGNO, pgno); mdbx_debug("loosen page %" PRIaPGNO, pgno);
const bool is_dirty = IS_DIRTY(mp); const bool is_dirty = IS_DIRTY(mp);
if (MDBX_DEBUG || unlikely(txn->mt_env->me_flags & MDBX_PAGEPERTURB)) { if (MDBX_DEBUG || unlikely((txn->mt_env->me_flags & MDBX_PAGEPERTURB) != 0)) {
mdbx_kill_page(txn->mt_env, mp, pgno, npages); mdbx_kill_page(txn->mt_env, mp, pgno, npages);
VALGRIND_MAKE_MEM_UNDEFINED(mp, PAGEHDRSZ); VALGRIND_MAKE_MEM_UNDEFINED(mp, PAGEHDRSZ);
} }
@ -4552,9 +4552,11 @@ int mdbx_txn_begin(MDBX_env *env, MDBX_txn *parent, unsigned flags,
mdbx_dpl_clear(txn->tw.dirtylist); mdbx_dpl_clear(txn->tw.dirtylist);
memcpy(txn->tw.reclaimed_pglist, parent->tw.reclaimed_pglist, memcpy(txn->tw.reclaimed_pglist, parent->tw.reclaimed_pglist,
MDBX_PNL_SIZEOF(parent->tw.reclaimed_pglist)); MDBX_PNL_SIZEOF(parent->tw.reclaimed_pglist));
mdbx_assert( mdbx_assert(env, mdbx_pnl_check4assert(
env, mdbx_pnl_check4assert(txn->tw.reclaimed_pglist, txn->tw.reclaimed_pglist,
txn->mt_next_pgno = parent->mt_next_pgno)); (txn->mt_next_pgno /* LY: intentional assigment here,
only for assertion */
= parent->mt_next_pgno)));
txn->tw.last_reclaimed = parent->tw.last_reclaimed; txn->tw.last_reclaimed = parent->tw.last_reclaimed;
if (parent->tw.lifo_reclaimed) { if (parent->tw.lifo_reclaimed) {
@ -6181,7 +6183,7 @@ int mdbx_txn_commit(MDBX_txn *txn) {
break; break;
} }
} }
mdbx_tassert(txn, mdbx_dirtylist_check(parent)); mdbx_tassert(parent, mdbx_dirtylist_check(parent));
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -8008,8 +8010,8 @@ __cold int mdbx_is_readahead_reasonable(size_t volume, intptr_t redundancy) {
if (volume <= 1024 * 1024 * 4ul) if (volume <= 1024 * 1024 * 4ul)
return MDBX_RESULT_TRUE; return MDBX_RESULT_TRUE;
const size_t pagesize = mdbx_syspagesize(); const intptr_t pagesize = mdbx_syspagesize();
if (unlikely(!mdbx_is_power2(pagesize) || pagesize < MIN_PAGESIZE)) if (unlikely(pagesize < MIN_PAGESIZE || !mdbx_is_power2(pagesize)))
return MDBX_INCOMPATIBLE; return MDBX_INCOMPATIBLE;
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)