tdb2: Make tdb1 share tdb_store flags, struct tdb_data and TDB_MAGIC_FOOD.

[ccan] / ccan / tdb2 / test / run-tdb1-wronghash-fail.c

diff --git a/ccan/tdb2/test/run-tdb1-wronghash-fail.c b/ccan/tdb2/test/run-tdb1-wronghash-fail.c
index 15047677a2ce2e73ca4d9daf288b34241e303e5a..368835ed7f263a73e0d34769da078b4965cc7c0c 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-wronghash-fail.c
+++ b/ccan/tdb2/test/run-tdb1-wronghash-fail.c
@@ -3,10 +3,11 @@
 #include <stdlib.h>
 #include <err.h>
 
-static void log_fn(struct tdb1_context *tdb, enum tdb1_debug_level level, const char *fmt, ...)
+static void log_fn(struct tdb1_context *tdb, enum tdb_log_level level,
+                  enum TDB_ERROR ecode, const char *message, void *priv)
 {
-       unsigned int *count = tdb->log.log_private;
-       if (strstr(fmt, "hash"))
+       unsigned int *count = priv;
+       if (strstr(message, "hash"))
                (*count)++;
 }
 
@@ -14,7 +15,7 @@ int main(int argc, char *argv[])
 {
        struct tdb1_context *tdb;
        unsigned int log_count;
-       TDB1_DATA d;
+       TDB_DATA d;
        struct tdb1_logging_context log_ctx = { log_fn, &log_count };
 
        plan_tests(28);
@@ -27,7 +28,7 @@ int main(int argc, char *argv[])
        ok1(log_count == 0);
        d.dptr = (void *)"Hello";
        d.dsize = 5;
-       ok1(tdb1_store(tdb, d, d, TDB1_INSERT) == 0);
+       ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
        tdb1_close(tdb);
 
        /* Fail to open with different hash. */