From 639ba8b7a5b4a9c2f07c895775370e542342dbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Mon, 1 Apr 2024 12:46:23 +0300 Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20`mdbx=5Fenv?= =?UTF-8?q?=5Fchk=5Fencount=5Fproblem()`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mdbx.h | 2 +- src/core.c | 8 ++++---- src/mdbx_chk.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mdbx.h b/mdbx.h index 9c721b47..aa9de079 100644 --- a/mdbx.h +++ b/mdbx.h @@ -6288,7 +6288,7 @@ LIBMDBX_API int mdbx_env_chk(MDBX_env *env, const MDBX_chk_callbacks_t *cb, enum MDBX_chk_severity verbosity, unsigned timeout_seconds_16dot16); /** FIXME */ -LIBMDBX_API int mdbx_env_chk_problem(MDBX_chk_context_t *ctx); +LIBMDBX_API int mdbx_env_chk_encount_problem(MDBX_chk_context_t *ctx); /** end of chk @} */ diff --git a/src/core.c b/src/core.c index 65da0b2e..6d000e9a 100644 --- a/src/core.c +++ b/src/core.c @@ -27075,7 +27075,7 @@ __cold __must_check_result static MDBX_chk_line_t * chk_line_begin(MDBX_chk_scope_t *const scope, enum MDBX_chk_severity severity) { MDBX_chk_internal_t *const chk = scope->internal; if (severity < MDBX_chk_warning) - mdbx_env_chk_problem(chk->usr); + mdbx_env_chk_encount_problem(chk->usr); MDBX_chk_line_t *line = nullptr; if (likely(chk->cb->print_begin)) { line = chk->cb->print_begin(chk->usr, severity); @@ -27270,7 +27270,7 @@ __cold static void MDBX_PRINTF_ARGS(5, 6) va_list args; va_start(args, extra_fmt); if (chk->cb->issue) { - mdbx_env_chk_problem(chk->usr); + mdbx_env_chk_encount_problem(chk->usr); chk->cb->issue(chk->usr, object, entry_number, caption, extra_fmt, args); } else { MDBX_chk_line_t *line = chk_line_begin(scope, MDBX_chk_error); @@ -27291,7 +27291,7 @@ __cold static void MDBX_PRINTF_ARGS(2, 3) va_list args; va_start(args, fmt); if (likely(chk->cb->issue)) { - mdbx_env_chk_problem(chk->usr); + mdbx_env_chk_encount_problem(chk->usr); chk->cb->issue(chk->usr, nullptr, 0, nullptr, fmt, args); } else chk_line_end( @@ -29025,7 +29025,7 @@ __cold static int env_chk(MDBX_chk_scope_t *const scope) { nullptr, nullptr)); } -__cold int mdbx_env_chk_problem(MDBX_chk_context_t *ctx) { +__cold int mdbx_env_chk_encount_problem(MDBX_chk_context_t *ctx) { if (likely(ctx && ctx->internal && ctx->internal->usr == ctx && ctx->internal->problem_counter && ctx->scope)) { *ctx->internal->problem_counter += 1; diff --git a/src/mdbx_chk.c b/src/mdbx_chk.c index a66e86d1..f84a0ad6 100644 --- a/src/mdbx_chk.c +++ b/src/mdbx_chk.c @@ -196,7 +196,7 @@ static FILE *MDBX_PRINTF_ARGS(2, 3) static void logger(MDBX_log_level_t level, const char *function, int line, const char *fmt, va_list args) { if (level <= MDBX_LOG_ERROR) - mdbx_env_chk_problem(&chk); + mdbx_env_chk_encount_problem(&chk); const unsigned kind = (level > MDBX_LOG_NOTICE) ? level - MDBX_LOG_NOTICE +