From a5e10b4ea1e3ae80b521c9100c0f58616cfd9034 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Fri, 18 Jun 2021 01:17:48 +0300 Subject: [PATCH] mdbx: minor refine `mdbx_cursor_eof()`. --- src/core.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/core.c b/src/core.c index 65cf4c29..d29c3466 100644 --- a/src/core.c +++ b/src/core.c @@ -20660,17 +20660,11 @@ int mdbx_cursor_eof(const MDBX_cursor *mc) { return (mc->mc_signature == MDBX_MC_READY4CLOSE) ? MDBX_EINVAL : MDBX_EBADSIGN; - if ((mc->mc_flags & C_INITIALIZED) == 0) - return MDBX_RESULT_TRUE; - - if (mc->mc_snum == 0) - return MDBX_RESULT_TRUE; - - if ((mc->mc_flags & C_EOF) || - mc->mc_ki[mc->mc_top] >= page_numkeys(mc->mc_pg[mc->mc_top])) - return MDBX_RESULT_TRUE; - - return MDBX_RESULT_FALSE; + return ((mc->mc_flags & (C_INITIALIZED | C_EOF)) == C_INITIALIZED && + mc->mc_snum && + mc->mc_ki[mc->mc_top] < page_numkeys(mc->mc_pg[mc->mc_top])) + ? MDBX_RESULT_FALSE + : MDBX_RESULT_TRUE; } //------------------------------------------------------------------------------