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

mdbx: refine error-msg.

Browse Source
This commit is contained in:
Leo Yuriev 2017-02-28 17:24:29 +03:00
parent 57dc59ecfb
commit f4bf454298
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mdbx.c
View File

@ -1338,21 +1338,20 @@ const char *mdbx_version(int *major, int *minor, int *patch) {
return MDB_VERSION_STRING; return MDB_VERSION_STRING;
} }
static const char *__mdbx_strerr(int err) { static const char *__mdbx_strerr(int errnum) {
/* Table of descriptions for LMDB errors */ /* Table of descriptions for LMDB errors */
static const char *const tbl[] = { static const char *const tbl[] = {
"MDB_KEYEXIST: Key/data pair already exists", "MDB_KEYEXIST: Key/data pair already exists",
"MDB_NOTFOUND: No matching key/data pair found", "MDB_NOTFOUND: No matching key/data pair found",
"MDB_PAGE_NOTFOUND: Requested page not found", "MDB_PAGE_NOTFOUND: Requested page not found",
"MDB_CORRUPTED: Located page was wrong type", "MDB_CORRUPTED: Located page was wrong data",
"MDB_PANIC: Update of meta page failed or environment had fatal error", "MDB_PANIC: Update of meta page failed or environment had fatal error",
"MDB_VERSION_MISMATCH: Database environment version mismatch", "MDB_VERSION_MISMATCH: DB version mismatch libmdbx",
"MDB_INVALID: File is not an LMDB file", "MDB_INVALID: File is not an LMDB file",
"MDB_MAP_FULL: Environment mapsize limit reached", "MDB_MAP_FULL: Environment mapsize limit reached",
"MDB_DBS_FULL: Environment maxdbs limit reached", "MDB_DBS_FULL: Too may DBI (maxdbs reached)",
"MDB_READERS_FULL: Environment maxreaders limit reached", "MDB_READERS_FULL: Too many readers (maxreaders reached)",
"MDB_TLS_FULL: Thread-local storage keys full - too many environments " NULL /* -30789 unused in MDBX */,
"open",
"MDB_TXN_FULL: Transaction has too many dirty pages - transaction too " "MDB_TXN_FULL: Transaction has too many dirty pages - transaction too "
"big", "big",
"MDB_CURSOR_FULL: Internal error - cursor stack limit reached", "MDB_CURSOR_FULL: Internal error - cursor stack limit reached",
@ -1367,31 +1366,31 @@ static const char *__mdbx_strerr(int err) {
"MDB_PROBLEM: Unexpected problem - txn should abort", "MDB_PROBLEM: Unexpected problem - txn should abort",
}; };
if (err >= MDB_KEYEXIST && err <= MDB_LAST_ERRCODE) { if (errnum >= MDB_KEYEXIST && errnum <= MDB_LAST_ERRCODE) {
int i = err - MDB_KEYEXIST; int i = errnum - MDB_KEYEXIST;
return tbl[i]; return tbl[i];
} }
switch (err) { switch (errnum) {
case MDB_SUCCESS: case MDB_SUCCESS:
return "Successful return: 0"; return "MDB_SUCCESS: Successful";
case MDBX_EMULTIVAL: case MDBX_EMULTIVAL:
return ""; return "MDBX_EMULTIVAL: Unable to update multi-value for the given key";
case MDBX_EBADSIGN: case MDBX_EBADSIGN:
return ""; return "MDBX_EBADSIGN: Wrong signature of a runtime object(s)";
default: default:
return NULL; return NULL;
} }
} }
const char *mdbx_strerror_r(int err, char *buf, size_t buflen) { const char *mdbx_strerror_r(int errnum, char *buf, size_t buflen) {
const char *msg = __mdbx_strerr(err); const char *msg = __mdbx_strerr(errnum);
return msg ? msg : strerror_r(err, buf, buflen); return msg ? msg : strerror_r(errnum, buf, buflen);
} }
const char *__cold mdbx_strerror(int err) { const char *__cold mdbx_strerror(int errnum) {
const char *msg = __mdbx_strerr(err); const char *msg = __mdbx_strerr(errnum);
return msg ? msg : strerror(err); return msg ? msg : strerror(errnum);
} }
#if MDBX_MODE_ENABLED #if MDBX_MODE_ENABLED

4
mdbx.h
View File

@ -355,8 +355,8 @@ const char *mdbx_version(int *major, int *minor, int *patch);
* [in] err The error code * [in] err The error code
* Returns "error message" The description of the error * Returns "error message" The description of the error
*/ */
const char *mdbx_strerror(int err); const char *mdbx_strerror(int errnum);
const char *mdbx_strerror_r(int err, char *buf, size_t buflen); const char *mdbx_strerror_r(int errnum, char *buf, size_t buflen);
/* Create an LMDB environment handle. /* Create an LMDB environment handle.
* *