diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-25 00:25:02 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-25 00:25:02 +0300 |
| commit | e62d2a2a86b0477537403a2316e629e8fea4a9d0 (patch) | |
| tree | 88525011a3320675a961a545e4b9bd0936522313 /libs/libmdbx | |
| parent | 661376ac4624e302525a3849c243652a60c5577c (diff) | |
patch to keep the same line numbers with the official one
Diffstat (limited to 'libs/libmdbx')
| -rw-r--r-- | libs/libmdbx/src/src/mdbx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/libmdbx/src/src/mdbx.c b/libs/libmdbx/src/src/mdbx.c index ad55a98f81..57d6ec1928 100644 --- a/libs/libmdbx/src/src/mdbx.c +++ b/libs/libmdbx/src/src/mdbx.c @@ -4355,8 +4355,7 @@ static int __cold mdbx_read_header(MDBX_env *env, MDBX_meta *meta, return MDBX_INVALID; } - if (page.mp_meta.mm_magic_and_version != MDBX_DATA_MAGIC && - page.mp_meta.mm_magic_and_version != MDBX_DATA_DEBUG) { + if (page.mp_meta.mm_magic_and_version != MDBX_DATA_MAGIC && page.mp_meta.mm_magic_and_version != MDBX_DATA_DEBUG) { mdbx_error("meta[%u] has invalid magic/version %" PRIx64, meta_number, page.mp_meta.mm_magic_and_version); return ((page.mp_meta.mm_magic_and_version >> 8) != MDBX_MAGIC) @@ -5707,8 +5706,7 @@ static int __cold mdbx_setup_lck(MDBX_env *env, char *lck_pathname, env->me_lck->mti_magic_and_version = MDBX_LOCK_MAGIC; env->me_lck->mti_os_and_format = MDBX_LOCK_FORMAT; } else { - if (env->me_lck->mti_magic_and_version != MDBX_LOCK_MAGIC && - env->me_lck->mti_magic_and_version != MDBX_LOCK_DEBUG) { + if (env->me_lck->mti_magic_and_version != MDBX_LOCK_MAGIC && env->me_lck->mti_magic_and_version != MDBX_LOCK_DEBUG) { mdbx_error("lock region has invalid magic/version"); return ((env->me_lck->mti_magic_and_version >> 8) != MDBX_MAGIC) ? MDBX_INVALID |