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

mdbx: fix GCC 13.x minor warnings (backport).

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2023-05-28 13:49:32 +03:00
parent 0fae7f98da
commit e2f6569a70
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core.c
View File

@ -14902,7 +14902,7 @@ int mdbx_cursor_get(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
int (*mfunc)(MDBX_cursor * mc, MDBX_val * key, MDBX_val * data); int (*mfunc)(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data);
switch (op) { switch (op) {
case MDBX_GET_CURRENT: { case MDBX_GET_CURRENT: {
if (unlikely(!(mc->mc_flags & C_INITIALIZED))) if (unlikely(!(mc->mc_flags & C_INITIALIZED)))
@ -15278,7 +15278,7 @@ static int mdbx_cursor_touch(MDBX_cursor *mc) {
} }
int mdbx_cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, int mdbx_cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data,
unsigned flags) { MDBX_put_flags_t flags) {
MDBX_env *env; MDBX_env *env;
MDBX_page *sub_root = NULL; MDBX_page *sub_root = NULL;
MDBX_val xdata, *rdata, dkey, olddata; MDBX_val xdata, *rdata, dkey, olddata;
@ -15807,7 +15807,7 @@ int mdbx_cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data,
} else { } else {
/* Data is on sub-page */ /* Data is on sub-page */
fp = olddata.iov_base; fp = olddata.iov_base;
switch (flags) { switch ((unsigned)flags) {
default: default:
if (!(mc->mc_db->md_flags & MDBX_DUPFIXED)) { if (!(mc->mc_db->md_flags & MDBX_DUPFIXED)) {
offset = node_size(data, nullptr) + sizeof(indx_t); offset = node_size(data, nullptr) + sizeof(indx_t);
@ -19082,7 +19082,7 @@ done:
} }
int mdbx_put(MDBX_txn *txn, MDBX_dbi dbi, const MDBX_val *key, MDBX_val *data, int mdbx_put(MDBX_txn *txn, MDBX_dbi dbi, const MDBX_val *key, MDBX_val *data,
unsigned flags) { MDBX_put_flags_t flags) {
int rc = check_txn_rw(txn, MDBX_TXN_BLOCKED); int rc = check_txn_rw(txn, MDBX_TXN_BLOCKED);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
@ -19705,7 +19705,7 @@ __cold static int mdbx_env_copy_asis(MDBX_env *env, MDBX_txn *read_txn,
} }
__cold int mdbx_env_copy2fd(MDBX_env *env, mdbx_filehandle_t fd, __cold int mdbx_env_copy2fd(MDBX_env *env, mdbx_filehandle_t fd,
unsigned flags) { MDBX_copy_flags_t flags) {
int rc = check_env(env, true); int rc = check_env(env, true);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
@ -21073,7 +21073,8 @@ mdbx_cleanup_dead_readers(MDBX_env *env, int rdt_locked, int *dead) {
return rc; return rc;
} }
__cold int mdbx_setup_debug(int loglevel, int flags, MDBX_debug_func *logger) { __cold int mdbx_setup_debug(MDBX_log_level_t loglevel, MDBX_debug_flags_t flags,
MDBX_debug_func *logger) {
const int rc = mdbx_runtime_flags | (mdbx_loglevel << 16); const int rc = mdbx_runtime_flags | (mdbx_loglevel << 16);
if (loglevel != MDBX_LOG_DONTCHANGE) if (loglevel != MDBX_LOG_DONTCHANGE)
@ -22550,11 +22551,11 @@ int64_t mdbx_int64_from_key(const MDBX_val v) {
UINT64_C(0x8000000000000000)); UINT64_C(0x8000000000000000));
} }
__cold MDBX_cmp_func *mdbx_get_keycmp(unsigned flags) { __cold MDBX_cmp_func *mdbx_get_keycmp(MDBX_db_flags_t flags) {
return get_default_keycmp(flags); return get_default_keycmp(flags);
} }
__cold MDBX_cmp_func *mdbx_get_datacmp(unsigned flags) { __cold MDBX_cmp_func *mdbx_get_datacmp(MDBX_db_flags_t flags) {
return get_default_datacmp(flags); return get_default_datacmp(flags);
} }