tdb2: Make TDB1 code use TDB2's open flags.

[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 5a7e311a9c28fa21b8d0bc9164e7e00caa618050..97a8293e7d255e5ea1bd1877e6608769e714d07b 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-wronghash-fail.c
+++ b/ccan/tdb2/test/run-tdb1-wronghash-fail.c
@@ -3,18 +3,31 @@
 #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 = tdb1_get_logging_private(tdb);
-       if (strstr(fmt, "hash"))
+       unsigned int *count = priv;
+       if (strstr(message, "hash"))
                (*count)++;
 }
 
+static unsigned int jenkins_hashfn(TDB_DATA *key)
+{
+       return hashlittle(key->dptr, key->dsize);
+}
+
+/* the tdb1_old_hash function is "magic" as it automatically makes us test the
+ * tdb1_incompatible_hash as well, so use this wrapper. */
+static unsigned int old_hash(TDB_DATA *key)
+{
+       return tdb1_old_hash(key);
+}
+
 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,12 +40,12 @@ 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. */
        tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
-                         &log_ctx, tdb1_jenkins_hash);
+                         &log_ctx, jenkins_hashfn);
        ok1(!tdb);
        ok1(log_count == 1);
 
@@ -40,7 +53,7 @@ int main(int argc, char *argv[])
        log_count = 0;
        tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0,
                          O_CREAT|O_RDWR|O_TRUNC,
-                         0600, &log_ctx, tdb1_jenkins_hash);
+                         0600, &log_ctx, jenkins_hashfn);
        ok1(tdb);
        ok1(log_count == 0);
        tdb1_close(tdb);
@@ -48,26 +61,26 @@ int main(int argc, char *argv[])
        /* Endian should be no problem. */
        log_count = 0;
        tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0,
-                         &log_ctx, tdb1_old_hash);
+                         &log_ctx, old_hash);
        ok1(!tdb);
        ok1(log_count == 1);
 
        log_count = 0;
        tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0,
-                         &log_ctx, tdb1_old_hash);
+                         &log_ctx, old_hash);
        ok1(!tdb);
        ok1(log_count == 1);
 
        log_count = 0;
        /* Fail to open with old default hash. */
        tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
-                         &log_ctx, tdb1_old_hash);
+                         &log_ctx, old_hash);
        ok1(!tdb);
        ok1(log_count == 1);
 
        log_count = 0;
        tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDONLY,
-                         0, &log_ctx, tdb1_jenkins_hash);
+                         0, &log_ctx, tdb1_incompatible_hash);
        ok1(tdb);
        ok1(log_count == 0);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);
@@ -75,7 +88,7 @@ int main(int argc, char *argv[])
 
        log_count = 0;
        tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDONLY,
-                         0, &log_ctx, tdb1_jenkins_hash);
+                         0, &log_ctx, tdb1_incompatible_hash);
        ok1(tdb);
        ok1(log_count == 0);
        ok1(tdb1_check(tdb, NULL, NULL) == 0);