-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
#include <ccan/tap/tap.h>
#include "logging.h"
enum TDB_ERROR delete_error;
};
-static int trav(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, void *p)
+static int trav(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
+ struct trav_data *td)
{
- struct trav_data *td = p;
int val;
td->calls++;
td->high = val;
if (td->delete) {
- if (tdb_delete(tdb, key) != 0) {
- td->delete_error = tdb_error(tdb);
+ td->delete_error = tdb_delete(tdb, key);
+ if (td->delete_error != TDB_SUCCESS) {
return -1;
}
}
};
static int trav_grow(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
- void *p)
+ struct trav_grow_data *tgd)
{
- struct trav_grow_data *tgd = p;
int val;
unsigned char buffer[128] = { 0 };
/* Make a big difference to the database. */
dbuf.dptr = buffer;
dbuf.dsize = sizeof(buffer);
- if (tdb_append(tdb, key, dbuf) != 0) {
- tgd->error = tdb_error(tdb);
+ tgd->error = tdb_append(tdb, key, dbuf);
+ if (tgd->error != TDB_SUCCESS) {
return -1;
}
return 0;
TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
TDB_NOMMAP|TDB_CONVERT };
union tdb_attribute hattr = { .hash = { .base = { TDB_ATTRIBUTE_HASH },
- .hash_fn = fixedhash,
- .hash_private = &seed } };
+ .fn = fixedhash,
+ .data = &seed } };
hattr.base.next = &tap_log_attr;