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

[ccan] / ccan / tdb2 / test / run-tdb1-incompatible.c

diff --git a/ccan/tdb2/test/run-tdb1-incompatible.c b/ccan/tdb2/test/run-tdb1-incompatible.c
index 5a4a61af331e918383ebbf1c1c8013479f7e5a05..51aa52d4b7e58744defbe0e86359f66051cb13c4 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-incompatible.c
+++ b/ccan/tdb2/test/run-tdb1-incompatible.c
@@ -3,15 +3,16 @@
 #include <stdlib.h>
 #include <err.h>
 
-static unsigned int tdb1_dumb_hash(TDB1_DATA *key)
+static unsigned int tdb1_dumb_hash(TDB_DATA *key)
 {
        return key->dsize;
 }
 
-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)++;
 }
 
@@ -34,7 +35,7 @@ int main(int argc, char *argv[])
 {
        struct tdb1_context *tdb;
        unsigned int log_count, flags;
-       TDB1_DATA d;
+       TDB_DATA d;
        struct tdb1_logging_context log_ctx = { log_fn, &log_count };
 
        plan_tests(38 * 2);
@@ -54,7 +55,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);
 
                /* Should not have marked rwlocks field. */
@@ -99,7 +100,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);
 
                /* Should have marked rwlocks field. */
@@ -148,7 +149,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);
 
                /* Should have marked rwlocks field. */