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

mdbx: fix minor MSVC warnings.

Browse Source 
Change-Id: I633b8847698dca25b6c395216744e157f6fb240d
This commit is contained in:
Leonid Yuriev 2021-01-20 09:41:58 +03:00
parent 0d09c2cda9
commit 7d09de489d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -2858,8 +2858,8 @@ static MDBX_PNL mdbx_spill_purge(MDBX_txn *txn) {
sl[w] = sl[r]; sl[w] = sl[r];
w += 1 - (sl[r] & 1); w += 1 - (sl[r] & 1);
} }
for (size_t r = 1; r < w; ++r) for (size_t i = 1; i < w; ++i)
mdbx_tassert(txn, (sl[r] & 1) == 0); mdbx_tassert(txn, (sl[i] & 1) == 0);
MDBX_PNL_SIZE(sl) = w - 1; MDBX_PNL_SIZE(sl) = w - 1;
txn->tw.spill_least_removed = INT_MAX; txn->tw.spill_least_removed = INT_MAX;
} else { } else {
@ -8761,7 +8761,6 @@ static __inline void mdbx_txn_merge(MDBX_txn *const parent, MDBX_txn *const txn,
/* from end to begin with dst extending */ /* from end to begin with dst extending */
for (l = dst->sorted, s = src->length, d = dst->length; s > 0 && d > 0;) { for (l = dst->sorted, s = src->length, d = dst->length; s > 0 && d > 0;) {
if (unlikely(l <= d)) { if (unlikely(l <= d)) {
unsigned r, w;
/* squash to get a gap of free space for merge */ /* squash to get a gap of free space for merge */
for (r = w = 1; r <= d; ++r) for (r = w = 1; r <= d; ++r)
if (dst->items[r].ptr) { if (dst->items[r].ptr) {
@ -8804,7 +8803,6 @@ static __inline void mdbx_txn_merge(MDBX_txn *const parent, MDBX_txn *const txn,
/* from begin to end with dst shrinking (a lot of new overflow pages) */ /* from begin to end with dst shrinking (a lot of new overflow pages) */
for (l = s = d = 1; s <= src->length && d <= dst->length;) { for (l = s = d = 1; s <= src->length && d <= dst->length;) {
if (unlikely(l >= d)) { if (unlikely(l >= d)) {
unsigned r, w;
/* squash to get a gap of free space for merge */ /* squash to get a gap of free space for merge */
for (r = w = dst->length; r >= d; --r) for (r = w = dst->length; r >= d; --r)
if (dst->items[r].ptr) { if (dst->items[r].ptr) {