From a430b3b288a1695dd3daf3facf09ebc98590e7e8 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: Wed, 24 Jul 2024 11:22:59 +0300 Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0?= =?UTF-8?q?=D1=82=D0=BA=D0=B8=20`0x%u`=20=D0=B2=20=D0=BB=D0=BE=D0=B3=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/coherency.c | 4 ++-- src/dxb.c | 4 ++-- src/meta.c | 4 ++-- src/txn.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/coherency.c b/src/coherency.c index d8406da1..41986ac1 100644 --- a/src/coherency.c +++ b/src/coherency.c @@ -162,8 +162,8 @@ __hot int coherency_check_head(MDBX_txn *txn, const meta_ptr_t head, if ((txn->dbs[FREE_DBI].flags & DB_PERSISTENT_FLAGS) != MDBX_INTEGERKEY || unaligned_peek_u64(4, &head.ptr_c->magic_and_version) == MDBX_DATA_MAGIC) { - ERROR("unexpected/invalid db-flags 0x%u for GC/FreeDB", - txn->dbs[FREE_DBI].flags); + ERROR("unexpected/invalid db-flags 0x%x for %s", txn->dbs[FREE_DBI].flags, + "GC/FreeDB"); return MDBX_INCOMPATIBLE; } txn->dbs[FREE_DBI].flags &= DB_PERSISTENT_FLAGS; diff --git a/src/dxb.c b/src/dxb.c index f9a62d36..e15e0832 100644 --- a/src/dxb.c +++ b/src/dxb.c @@ -628,8 +628,8 @@ __cold int dxb_setup(MDBX_env *env, const int lck_rc, if (unlikely((header.trees.gc.flags & DB_PERSISTENT_FLAGS) != MDBX_INTEGERKEY)) { - ERROR("unexpected/invalid db-flags 0x%u for GC/FreeDB", - header.trees.gc.flags); + ERROR("unexpected/invalid db-flags 0x%x for %s", header.trees.gc.flags, + "GC/FreeDB"); return MDBX_INCOMPATIBLE; } env->dbs_flags[FREE_DBI] = DB_VALID | MDBX_INTEGERKEY; diff --git a/src/meta.c b/src/meta.c index 3711c747..3f2bfcd6 100644 --- a/src/meta.c +++ b/src/meta.c @@ -544,13 +544,13 @@ __cold int meta_validate(MDBX_env *env, meta_t *const meta, if (unlikely(meta->trees.gc.flags != MDBX_INTEGERKEY) && ((meta->trees.gc.flags & DB_PERSISTENT_FLAGS) != MDBX_INTEGERKEY || magic_and_version == MDBX_DATA_MAGIC)) { - WARNING("meta[%u] has invalid %s flags 0x%u, skip it", meta_number, + WARNING("meta[%u] has invalid %s flags 0x%x, skip it", meta_number, "GC/FreeDB", meta->trees.gc.flags); return MDBX_INCOMPATIBLE; } if (unlikely(!check_sdb_flags(meta->trees.main.flags))) { - WARNING("meta[%u] has invalid %s flags 0x%u, skip it", meta_number, + WARNING("meta[%u] has invalid %s flags 0x%x, skip it", meta_number, "MainDB", meta->trees.main.flags); return MDBX_INCOMPATIBLE; } diff --git a/src/txn.c b/src/txn.c index 59c661f1..276692bc 100644 --- a/src/txn.c +++ b/src/txn.c @@ -1222,8 +1222,8 @@ int txn_renew(MDBX_txn *txn, unsigned flags) { } if (unlikely(txn->dbs[FREE_DBI].flags != MDBX_INTEGERKEY)) { - ERROR("unexpected/invalid db-flags 0x%u for GC/FreeDB", - txn->dbs[FREE_DBI].flags); + ERROR("unexpected/invalid db-flags 0x%x for %s", txn->dbs[FREE_DBI].flags, + "GC/FreeDB"); rc = MDBX_INCOMPATIBLE; goto bailout; }