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

mdbx: minor fix/workaround to avoid GCC 10.x pedantic warnings.

Browse Source 
Change-Id: If67c1ae593ad2c39130054475c37321dca761f5b
This commit is contained in:
Leonid Yuriev 2020-04-07 01:54:58 +03:00
parent d37d3b54f4
commit 4ad1c2daed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elements/core.c
View File

@ -4933,7 +4933,7 @@ skip_cache:
goto fail; goto fail;
} }
MDBX_cursor recur; MDBX_cursor_couple recur;
for (MDBX_cursor_op op = MDBX_FIRST;; for (MDBX_cursor_op op = MDBX_FIRST;;
op = (flags & MDBX_LIFORECLAIM) ? MDBX_PREV : MDBX_NEXT) { op = (flags & MDBX_LIFORECLAIM) ? MDBX_PREV : MDBX_NEXT) {
MDBX_val key, data; MDBX_val key, data;
@ -4979,7 +4979,7 @@ skip_cache:
/* Prepare to fetch more and coalesce */ /* Prepare to fetch more and coalesce */
oldest = (flags & MDBX_LIFORECLAIM) ? mdbx_find_oldest(txn) oldest = (flags & MDBX_LIFORECLAIM) ? mdbx_find_oldest(txn)
: *env->me_oldest; : *env->me_oldest;
rc = mdbx_cursor_init(&recur, txn, FREE_DBI); rc = mdbx_cursor_init(&recur.outer, txn, FREE_DBI);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto fail; goto fail;
if (flags & MDBX_LIFORECLAIM) { if (flags & MDBX_LIFORECLAIM) {
@ -5007,7 +5007,7 @@ skip_cache:
} }
} }
rc = mdbx_cursor_get(&recur, &key, NULL, op); rc = mdbx_cursor_get(&recur.outer, &key, NULL, op);
if (rc == MDBX_NOTFOUND && (flags & MDBX_LIFORECLAIM)) { if (rc == MDBX_NOTFOUND && (flags & MDBX_LIFORECLAIM)) {
if (op == MDBX_SET_RANGE) if (op == MDBX_SET_RANGE)
continue; continue;
@ -5018,7 +5018,7 @@ skip_cache:
key.iov_base = &last; key.iov_base = &last;
key.iov_len = sizeof(last); key.iov_len = sizeof(last);
op = MDBX_SET_RANGE; op = MDBX_SET_RANGE;
rc = mdbx_cursor_get(&recur, &key, NULL, op); rc = mdbx_cursor_get(&recur.outer, &key, NULL, op);
} }
} }
if (unlikely(rc)) { if (unlikely(rc)) {
@ -5058,9 +5058,10 @@ skip_cache:
} }
/* Reading next GC record */ /* Reading next GC record */
np = recur.mc_pg[recur.mc_top]; np = recur.outer.mc_pg[recur.outer.mc_top];
if (unlikely((rc = mdbx_node_read( if (unlikely((rc = mdbx_node_read(
&recur, page_node(np, recur.mc_ki[recur.mc_top]), &recur.outer,
page_node(np, recur.outer.mc_ki[recur.outer.mc_top]),
&data)) != MDBX_SUCCESS)) &data)) != MDBX_SUCCESS))
goto fail; goto fail;