Cleanup mtest* and sample-*.

[openldap] / libraries / liblmdb / mtest3.c

diff --git a/libraries/liblmdb/mtest3.c b/libraries/liblmdb/mtest3.c
index 85872c67ed4326e554f652b3cecd1cf7e5dfd2bf..9db79e625d24619229b095ff822560673ae13da3 100644 (file)
--- a/libraries/liblmdb/mtest3.c
+++ b/libraries/liblmdb/mtest3.c
@@ -53,8 +53,9 @@ int main(int argc,char * argv[])
        E(mdb_env_set_mapsize(env, 10485760));
        E(mdb_env_set_maxdbs(env, 4));
        E(mdb_env_open(env, "./testdb", MDB_FIXEDMAP|MDB_NOSYNC, 0664));
+
        E(mdb_txn_begin(env, NULL, 0, &txn));
-       E(mdb_open(txn, "id2", MDB_CREATE|MDB_DUPSORT, &dbi));
+       E(mdb_dbi_open(txn, "id2", MDB_CREATE|MDB_DUPSORT, &dbi));
 
        key.mv_size = sizeof(int);
        key.mv_data = kval;
@@ -73,7 +74,7 @@ int main(int argc,char * argv[])
        E(mdb_txn_commit(txn));
        E(mdb_env_stat(env, &mst));
 
-       E(mdb_txn_begin(env, NULL, 1, &txn));
+       E(mdb_txn_begin(env, NULL, MDB_RDONLY, &txn));
        E(mdb_cursor_open(txn, dbi, &cursor));
        while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
                printf("key: %p %.*s, data: %p %.*s\n",
@@ -107,7 +108,7 @@ int main(int argc,char * argv[])
        printf("Deleted %d values\n", j);
 
        E(mdb_env_stat(env, &mst));
-       E(mdb_txn_begin(env, NULL, 1, &txn));
+       E(mdb_txn_begin(env, NULL, MDB_RDONLY, &txn));
        E(mdb_cursor_open(txn, dbi, &cursor));
        printf("Cursor next\n");
        while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
@@ -124,10 +125,9 @@ int main(int argc,char * argv[])
        }
        CHECK(rc == MDB_NOTFOUND, "mdb_cursor_get");
        mdb_cursor_close(cursor);
-       mdb_close(env, dbi);
-
        mdb_txn_abort(txn);
-       mdb_env_close(env);
 
+       mdb_dbi_close(env, dbi);
+       mdb_env_close(env);
        return 0;
 }