From bd2c3d1c9c93008b074254a801dcb4385ae3534a Mon Sep 17 00:00:00 2001
From: Leonid Yuriev <leo@yuriev.ru>
Date: Mon, 15 Mar 2021 01:31:38 +0300
Subject: [PATCH] mdbx-tools: minor refine/cleanup.

Change-Id: I94974246c1212cf98bf3d31419e8a0fc24c5decc
---
 src/mdbx_copy.c |  6 +++---
 src/mdbx_drop.c | 31 +++++++++++++++++++------------
 src/mdbx_stat.c |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/mdbx_copy.c b/src/mdbx_copy.c
index a72cd783..d9fb27e7 100644
--- a/src/mdbx_copy.c
+++ b/src/mdbx_copy.c
@@ -117,9 +117,9 @@ int main(int argc, char *argv[]) {
 
   act = "opening environment";
   rc = mdbx_env_create(&env);
-  if (rc == MDBX_SUCCESS) {
-    rc = mdbx_env_open(env, argv[1], flags, 0640);
-  }
+  if (rc == MDBX_SUCCESS)
+    rc = mdbx_env_open(env, argv[1], flags, 0);
+
   if (rc == MDBX_SUCCESS) {
     act = "copying";
     if (argc == 2) {
diff --git a/src/mdbx_drop.c b/src/mdbx_drop.c
index 258fdf0f..4f9dfea4 100644
--- a/src/mdbx_drop.c
+++ b/src/mdbx_drop.c
@@ -140,39 +140,46 @@ int main(int argc, char *argv[]) {
   fflush(nullptr);
 
   rc = mdbx_env_create(&env);
-  if (rc) {
+  if (unlikely(rc != MDBX_SUCCESS)) {
     error("mdbx_env_create", rc);
     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);
-  if (rc) {
+  rc = mdbx_env_open(env, envname, envflags, 0);
+  if (unlikely(rc != MDBX_SUCCESS)) {
     error("mdbx_env_open", rc);
     goto env_close;
   }
 
   rc = mdbx_txn_begin(env, NULL, 0, &txn);
-  if (rc) {
+  if (unlikely(rc != MDBX_SUCCESS)) {
     error("mdbx_txn_begin", rc);
     goto env_close;
   }
 
-  rc = mdbx_dbi_open(txn, subname, 0, &dbi);
-  if (rc) {
-    error("mdbx_open failed", rc);
+  rc = mdbx_dbi_open(txn, subname, MDBX_DB_ACCEDE, &dbi);
+  if (unlikely(rc != MDBX_SUCCESS)) {
+    error("mdbx_open", rc);
     goto txn_abort;
   }
 
   rc = mdbx_drop(txn, dbi, delete);
-  if (rc) {
-    error("mdbx_drop failed", rc);
+  if (unlikely(rc != MDBX_SUCCESS)) {
+    error("mdbx_drop", rc);
     goto txn_abort;
   }
+
   rc = mdbx_txn_commit(txn);
-  if (rc) {
-    error("mdbx_txn_commit failed", rc);
+  if (unlikely(rc != MDBX_SUCCESS)) {
+    error("mdbx_txn_commit", rc);
     goto txn_abort;
   }
   txn = nullptr;
diff --git a/src/mdbx_stat.c b/src/mdbx_stat.c
index 9af226ba..fc01cfa2 100644
--- a/src/mdbx_stat.c
+++ b/src/mdbx_stat.c
@@ -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)) {
     error("mdbx_env_open", rc);
     goto env_close;