X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibmdb%2Fmtest.c;h=bb5ec816b628b25a967489ce5ca1559409a1cb1c;hb=75b97f03e4137325b1141f8fa6f4034ef03b47a0;hp=8d08c2472b72f9e8ba4446e0b03c0d50d42ff101;hpb=314ac289389eb2a02b03db4ebe1a5976a0abe53c;p=openldap

diff --git a/libraries/libmdb/mtest.c b/libraries/libmdb/mtest.c
index 8d08c2472b..bb5ec816b6 100644
--- a/libraries/libmdb/mtest.c
+++ b/libraries/libmdb/mtest.c
@@ -25,7 +25,7 @@ int main(int argc,char * argv[])
 	MDB_val key, data;
 	MDB_txn *txn;
 	MDB_stat mst;
-	MDB_cursor *cursor, *cur2;
+	MDB_cursor *cursor;
 	int count;
 	int *values;
 	char sval[32];
@@ -39,10 +39,10 @@ int main(int argc,char * argv[])
 			values[i] = random()%1024;
 	    }
     
-		rc = mdbenv_create(&env);
-		rc = mdbenv_set_mapsize(env, 10485760);
-		rc = mdbenv_open(env, "./testdb", MDB_FIXEDMAP|MDB_NOSYNC, 0664);
-		rc = mdb_txn_begin(env, 0, &txn);
+		rc = mdb_env_create(&env);
+		rc = mdb_env_set_mapsize(env, 10485760);
+		rc = mdb_env_open(env, "./testdb", MDB_FIXEDMAP /*|MDB_NOSYNC*/, 0664);
+		rc = mdb_txn_begin(env, NULL, 0, &txn);
 		rc = mdb_open(txn, NULL, 0, &dbi);
    
 		key.mv_size = sizeof(int);
@@ -58,9 +58,9 @@ int main(int argc,char * argv[])
 	    }
 		if (j) printf("%d duplicates skipped\n", j);
 		rc = mdb_txn_commit(txn);
-		rc = mdbenv_stat(env, &mst);
+		rc = mdb_env_stat(env, &mst);
 
-		rc = mdb_txn_begin(env, 1, &txn);
+		rc = mdb_txn_begin(env, NULL, 1, &txn);
 		rc = 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",
@@ -75,9 +75,9 @@ int main(int argc,char * argv[])
 	    for (i= count - 1; i > -1; i-= (random()%5)) {	
 			j++;
 			txn=NULL;
-			rc = mdb_txn_begin(env, 0, &txn);
+			rc = mdb_txn_begin(env, NULL, 0, &txn);
 			sprintf(sval, "%03x ", values[i]);
-			rc = mdb_del(txn, dbi, &key, NULL, 0);
+			rc = mdb_del(txn, dbi, &key, NULL);
 			if (rc) {
 				j--;
 				mdb_txn_abort(txn);
@@ -88,8 +88,8 @@ int main(int argc,char * argv[])
 	    free(values);
 		printf("Deleted %d values\n", j);
 
-		rc = mdbenv_stat(env, &mst);
-		rc = mdb_txn_begin(env, 1, &txn);
+		rc = mdb_env_stat(env, &mst);
+		rc = mdb_txn_begin(env, NULL, 1, &txn);
 		rc = mdb_cursor_open(txn, dbi, &cursor);
 		printf("Cursor next\n");
 		while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
@@ -108,7 +108,7 @@ int main(int argc,char * argv[])
 		 * this stuff all breaks
 		 */
 		printf("Deleting with cursor\n");
-		rc = mdb_txn_begin(env, 0, &txn);
+		rc = mdb_txn_begin(env, NULL, 0, &txn);
 		rc = mdb_cursor_open(db, txn, &cur2);
 		for (i=0; i<50; i++) {
 			rc = mdb_cursor_get(cur2, &key, &data, MDB_NEXT);
@@ -146,10 +146,10 @@ int main(int argc,char * argv[])
 		}
 #endif
 		mdb_cursor_close(cursor);
-		mdb_close(txn, dbi);
+		mdb_close(env, dbi);
 
 		mdb_txn_abort(txn);
-		mdbenv_close(env);
+		mdb_env_close(env);
 
 	return 0;
 }