#include <ccan/tap/tap.h>
#include <stdlib.h>
#include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
#undef fcntl
#define NUM_ENTRIES 10
-static bool prepare_entries(struct tdb1_context *tdb)
+static bool prepare_entries(struct tdb_context *tdb)
{
unsigned int i;
- TDB1_DATA key, data;
+ TDB_DATA key, data;
for (i = 0; i < NUM_ENTRIES; i++) {
key.dsize = sizeof(i);
data.dsize = strlen("world");
data.dptr = (void *)"world";
- if (tdb1_store(tdb, key, data, 0) != 0)
+ if (tdb_store(tdb, key, data, 0) != TDB_SUCCESS)
return false;
}
return true;
}
-static void delete_entries(struct tdb1_context *tdb)
+static void delete_entries(struct tdb_context *tdb)
{
unsigned int i;
- TDB1_DATA key;
+ TDB_DATA key;
for (i = 0; i < NUM_ENTRIES; i++) {
key.dsize = sizeof(i);
}
/* We don't know how many times this will run. */
-static int delete_other(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
void *private_data)
{
unsigned int i;
return 0;
}
-static int delete_self(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
void *private_data)
{
ok1(tdb1_delete(tdb, key) == 0);
int main(int argc, char *argv[])
{
- struct tdb1_context *tdb;
+ struct tdb_context *tdb;
int errors = 0;
+ union tdb_attribute hsize;
+
+ hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+ hsize.base.next = &tap_log_attr;
+ hsize.tdb1_hashsize.hsize = 1024;
plan_tests(41);
- tdb = tdb1_open_ex("run-no-lock-during-traverse.tdb",
- 1024, TDB1_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR,
- 0600, &taplogctx, NULL);
+ tdb = tdb_open("run-no-lock-during-traverse.tdb1",
+ TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
+ 0600, &hsize);
ok1(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
ok1(tdb1_unlockall(tdb) == 0);
- ok1(tdb1_close(tdb) == 0);
+ ok1(tdb_close(tdb) == 0);
return exit_status();
}