From c5be1292ac21fed2242ad98f3ae5b491d8b8cdea Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 1 Jul 2014 05:11:43 -0700 Subject: [PATCH] All diagnostics should go to stderr --- libraries/liblmdb/mdb_dump.c | 8 ++++---- libraries/liblmdb/mdb_load.c | 12 ++++++------ libraries/liblmdb/mdb_stat.c | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/liblmdb/mdb_dump.c b/libraries/liblmdb/mdb_dump.c index c684375..45243f4 100644 --- a/libraries/liblmdb/mdb_dump.c +++ b/libraries/liblmdb/mdb_dump.c @@ -226,19 +226,19 @@ int main(int argc, char *argv[]) rc = mdb_env_open(env, envname, envflags | MDB_RDONLY, 0664); if (rc) { - printf("mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn); if (rc) { - printf("mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } rc = mdb_open(txn, subname, 0, &dbi); if (rc) { - printf("mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } @@ -249,7 +249,7 @@ int main(int argc, char *argv[]) rc = mdb_cursor_open(txn, dbi, &cursor); if (rc) { - printf("mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } while ((rc = mdb_cursor_get(cursor, &key, NULL, MDB_NEXT_NODUP)) == 0) { diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c index 0cf02ad..e33dd5e 100644 --- a/libraries/liblmdb/mdb_load.c +++ b/libraries/liblmdb/mdb_load.c @@ -305,7 +305,7 @@ int main(int argc, char *argv[]) rc = mdb_env_open(env, envname, envflags, 0664); if (rc) { - printf("mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } @@ -324,19 +324,19 @@ int main(int argc, char *argv[]) rc = mdb_txn_begin(env, NULL, 0, &txn); if (rc) { - printf("mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } rc = mdb_open(txn, subname, flags|MDB_CREATE, &dbi); if (rc) { - printf("mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } rc = mdb_cursor_open(txn, dbi, &mc); if (rc) { - printf("mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } @@ -366,12 +366,12 @@ int main(int argc, char *argv[]) } rc = mdb_txn_begin(env, NULL, 0, &txn); if (rc) { - printf("mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } rc = mdb_cursor_open(txn, dbi, &mc); if (rc) { - printf("mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } batch = 0; diff --git a/libraries/liblmdb/mdb_stat.c b/libraries/liblmdb/mdb_stat.c index eac2c60..25c092c 100644 --- a/libraries/liblmdb/mdb_stat.c +++ b/libraries/liblmdb/mdb_stat.c @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) rc = mdb_env_open(env, envname, envflags | MDB_RDONLY, 0664); if (rc) { - printf("mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn); if (rc) { - printf("mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc)); goto env_close; } @@ -158,12 +158,12 @@ int main(int argc, char *argv[]) dbi = 0; rc = mdb_cursor_open(txn, dbi, &cursor); if (rc) { - printf("mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } rc = mdb_stat(txn, dbi, &mst); if (rc) { - printf("mdb_stat failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_stat failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } prstat(&mst); @@ -201,13 +201,13 @@ int main(int argc, char *argv[]) rc = mdb_open(txn, subname, 0, &dbi); if (rc) { - printf("mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } rc = mdb_stat(txn, dbi, &mst); if (rc) { - printf("mdb_stat failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_stat failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } printf("Status of %s\n", subname ? subname : "Main DB"); @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) rc = mdb_cursor_open(txn, dbi, &cursor); if (rc) { - printf("mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_cursor_open failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } while ((rc = mdb_cursor_get(cursor, &key, NULL, MDB_NEXT_NODUP)) == 0) { @@ -237,7 +237,7 @@ int main(int argc, char *argv[]) if (rc) continue; rc = mdb_stat(txn, db2, &mst); if (rc) { - printf("mdb_stat failed, error %d %s\n", rc, mdb_strerror(rc)); + fprintf(stderr, "mdb_stat failed, error %d %s\n", rc, mdb_strerror(rc)); goto txn_abort; } prstat(&mst);