mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-27 03:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mdb.master'

Browse Source
This commit is contained in:
Howard Chu 2012-08-24 05:34:29 -07:00
commit f980c64cb6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/libmdb/mdb_stat.c
View File

@ -36,17 +36,17 @@ int main(int argc,char * argv[])
rc = mdb_env_open(env, envname, MDB_RDONLY, 0); rc = mdb_env_open(env, envname, MDB_RDONLY, 0);
if (rc) { if (rc) {
printf("mdb_env_open failed, error %d\n", rc); printf("mdb_env_open failed, error %d\n", rc);
exit(1); goto env_close;
} }
rc = mdb_txn_begin(env, NULL, 1, &txn); rc = mdb_txn_begin(env, NULL, 1, &txn);
if (rc) { if (rc) {
printf("mdb_txn_begin failed, error %d\n", rc); printf("mdb_txn_begin failed, error %d\n", rc);
exit(1); goto env_close;
} }
rc = mdb_open(txn, subname, 0, &dbi); rc = mdb_open(txn, subname, 0, &dbi);
if (rc) { if (rc) {
printf("mdb_open failed, error %d\n", rc); printf("mdb_open failed, error %d\n", rc);
exit(1); goto txn_abort;
} }
rc = mdb_stat(txn, dbi, &mst); rc = mdb_stat(txn, dbi, &mst);
@ -57,8 +57,10 @@ int main(int argc,char * argv[])
printf("Overflow pages: %zu\n", mst.ms_overflow_pages); printf("Overflow pages: %zu\n", mst.ms_overflow_pages);
printf("Entries: %zu\n", mst.ms_entries); printf("Entries: %zu\n", mst.ms_entries);
mdb_close(env, dbi); mdb_close(env, dbi);
txn_abort:
mdb_txn_abort(txn); mdb_txn_abort(txn);
env_close:
mdb_env_close(env); mdb_env_close(env);
return 0; return rc ? EXIT_FAILURE : EXIT_SUCCESS;
} }

10
libraries/libmdb/mdb_stata.c
View File

@ -34,17 +34,17 @@ int main(int argc,char * argv[])
rc = mdb_env_open(env, envname, MDB_RDONLY, 0); rc = mdb_env_open(env, envname, MDB_RDONLY, 0);
if (rc) { if (rc) {
printf("mdb_env_open failed, error %d\n", rc); printf("mdb_env_open failed, error %d\n", rc);
exit(1); goto env_close;
} }
rc = mdb_txn_begin(env, NULL, 1, &txn); rc = mdb_txn_begin(env, NULL, 1, &txn);
if (rc) { if (rc) {
printf("mdb_txn_begin failed, error %d\n", rc); printf("mdb_txn_begin failed, error %d\n", rc);
exit(1); goto env_close;
} }
rc = mdb_open(txn, NULL, 0, &dbi); rc = mdb_open(txn, NULL, 0, &dbi);
if (rc) { if (rc) {
printf("mdb_open failed, error %d\n", rc); printf("mdb_open failed, error %d\n", rc);
exit(1); goto txn_abort;
} }
rc = mdb_stat(txn, dbi, &mst); rc = mdb_stat(txn, dbi, &mst);
@ -75,8 +75,10 @@ int main(int argc,char * argv[])
} }
mdb_cursor_close(cursor); mdb_cursor_close(cursor);
mdb_close(env, dbi); mdb_close(env, dbi);
txn_abort:
mdb_txn_abort(txn); mdb_txn_abort(txn);
env_close:
mdb_env_close(env); mdb_env_close(env);
return 0; return rc ? EXIT_FAILURE : EXIT_SUCCESS;
} }