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

mdbx: clarify/refine error messages of a signature/version mismatch.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-03-24 00:19:34 +03:00
parent 3db02d2236
commit 45f8197635
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core.c
View File

@ -12524,14 +12524,19 @@ __cold static int mdbx_setup_lck(MDBX_env *env, char *lck_pathname,
} }
} else { } else {
if (lck->mti_magic_and_version != MDBX_LOCK_MAGIC) { if (lck->mti_magic_and_version != MDBX_LOCK_MAGIC) {
mdbx_error("%s", "lock region has invalid magic/version"); const bool invalid = (lck->mti_magic_and_version >> 8) != MDBX_MAGIC;
err = ((lck->mti_magic_and_version >> 8) != MDBX_MAGIC) mdbx_error(
? MDBX_INVALID "lock region has %s",
: MDBX_VERSION_MISMATCH; invalid
? "invalid magic"
: "incompatible version (only applications with nearly or the "
"same versions of libmdbx can share the same database)");
err = invalid ? MDBX_INVALID : MDBX_VERSION_MISMATCH;
goto bailout; goto bailout;
} }
if (lck->mti_os_and_format != MDBX_LOCK_FORMAT) { if (lck->mti_os_and_format != MDBX_LOCK_FORMAT) {
mdbx_error("lock region has os/format 0x%" PRIx32 ", expected 0x%" PRIx32, mdbx_error("lock region has os/format signature 0x%" PRIx32
", expected 0x%" PRIx32,
lck->mti_os_and_format, MDBX_LOCK_FORMAT); lck->mti_os_and_format, MDBX_LOCK_FORMAT);
err = MDBX_VERSION_MISMATCH; err = MDBX_VERSION_MISMATCH;
goto bailout; goto bailout;