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

mdbx-tools: minor refine/cleanup.

Browse Source 
Change-Id: I94974246c1212cf98bf3d31419e8a0fc24c5decc
This commit is contained in:
Leonid Yuriev 2021-03-15 01:31:38 +03:00
parent 3eb343020d
commit bd2c3d1c9c
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mdbx_copy.c
View File

@ -117,9 +117,9 @@ int main(int argc, char *argv[]) {
act = "opening environment"; act = "opening environment";
rc = mdbx_env_create(&env); rc = mdbx_env_create(&env);
if (rc == MDBX_SUCCESS) { if (rc == MDBX_SUCCESS)
rc = mdbx_env_open(env, argv[1], flags, 0640); rc = mdbx_env_open(env, argv[1], flags, 0);
}
if (rc == MDBX_SUCCESS) { if (rc == MDBX_SUCCESS) {
act = "copying"; act = "copying";
if (argc == 2) { if (argc == 2) {

31
src/mdbx_drop.c
View File

@ -140,39 +140,46 @@ int main(int argc, char *argv[]) {
fflush(nullptr); fflush(nullptr);
rc = mdbx_env_create(&env); rc = mdbx_env_create(&env);
if (rc) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_env_create", rc); error("mdbx_env_create", rc);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
mdbx_env_set_maxdbs(env, 2); if (subname) {
rc = mdbx_env_set_maxdbs(env, 2);
if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_env_set_maxdbs", rc);
goto env_close;
}
}
rc = mdbx_env_open(env, envname, envflags, 0664); rc = mdbx_env_open(env, envname, envflags, 0);
if (rc) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_env_open", rc); error("mdbx_env_open", rc);
goto env_close; goto env_close;
} }
rc = mdbx_txn_begin(env, NULL, 0, &txn); rc = mdbx_txn_begin(env, NULL, 0, &txn);
if (rc) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_txn_begin", rc); error("mdbx_txn_begin", rc);
goto env_close; goto env_close;
} }
rc = mdbx_dbi_open(txn, subname, 0, &dbi); rc = mdbx_dbi_open(txn, subname, MDBX_DB_ACCEDE, &dbi);
if (rc) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_open failed", rc); error("mdbx_open", rc);
goto txn_abort; goto txn_abort;
} }
rc = mdbx_drop(txn, dbi, delete); rc = mdbx_drop(txn, dbi, delete);
if (rc) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_drop failed", rc); error("mdbx_drop", rc);
goto txn_abort; goto txn_abort;
} }
rc = mdbx_txn_commit(txn); rc = mdbx_txn_commit(txn);
if (rc) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_txn_commit failed", rc); error("mdbx_txn_commit", rc);
goto txn_abort; goto txn_abort;
} }
txn = nullptr; txn = nullptr;

2
src/mdbx_stat.c
View File

@ -194,7 +194,7 @@ int main(int argc, char *argv[]) {
} }
} }
rc = mdbx_env_open(env, envname, envflags | MDBX_RDONLY, 0664); rc = mdbx_env_open(env, envname, envflags | MDBX_RDONLY, 0);
if (unlikely(rc != MDBX_SUCCESS)) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_env_open", rc); error("mdbx_env_open", rc);
goto env_close; goto env_close;