Happy New Year

[openldap] / libraries / liblmdb / mtest3.c

diff --git a/libraries/liblmdb/mtest3.c b/libraries/liblmdb/mtest3.c
index 95b174968844e7e631b0af4137706806d9884d0c..4390d7ab4a3543de4fc5f485889577d28f0aac8e 100644 (file)
--- a/libraries/liblmdb/mtest3.c
+++ b/libraries/liblmdb/mtest3.c
@@ -1,6 +1,6 @@
 /* mtest3.c - memory-mapped database tester/toy */
 /*
- * Copyright 2011 Howard Chu, Symas Corp.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,6 @@
  */
 
 /* Tests for sorted duplicate DBs */
-#define _XOPEN_SOURCE 500              /* srandom(), random() */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,23 +38,24 @@ int main(int argc,char * argv[])
        char sval[32];
        char kval[sizeof(int)];
 
-       srandom(time(NULL));
+       srand(time(NULL));
 
        memset(sval, 0, sizeof(sval));
 
-       count = (random()%384) + 64;
+       count = (rand()%384) + 64;
        values = (int *)malloc(count*sizeof(int));
 
        for(i = 0;i<count;i++) {
-               values[i] = random()%1024;
+               values[i] = rand()%1024;
        }
 
        E(mdb_env_create(&env));
        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;
@@ -74,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",
@@ -87,7 +87,7 @@ int main(int argc,char * argv[])
 
        j=0;
 
-       for (i= count - 1; i > -1; i-= (random()%5)) {
+       for (i= count - 1; i > -1; i-= (rand()%5)) {
                j++;
                txn=NULL;
                E(mdb_txn_begin(env, NULL, 0, &txn));
@@ -108,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) {
@@ -125,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;
 }