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

[ccan] / ccan / tdb2 / test / tdb1-external-agent.c

diff --git a/ccan/tdb2/test/tdb1-external-agent.c b/ccan/tdb2/test/tdb1-external-agent.c
index 3f73ae3aaf5b713caf40a3daf2c042830cf46ade..f60df5b7025b0feaca808bb585450ac4861b6265 100644 (file)
--- a/ccan/tdb2/test/tdb1-external-agent.c
+++ b/ccan/tdb2/test/tdb1-external-agent.c
@@ -20,9 +20,9 @@ static struct tdb1_context *tdb;
 
 static enum agent_return do_operation(enum operation op, const char *name)
 {
-       TDB1_DATA k;
+       TDB_DATA k;
        enum agent_return ret;
-       TDB1_DATA data;
+       TDB_DATA data;
 
        if (op != OPEN && op != OPEN_WITH_CLEAR_IF_FIRST && !tdb) {
                diag("external: No tdb open!");
@@ -36,7 +36,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
        switch (op) {
        case OPEN:
                if (tdb) {
-                       diag("Already have tdb %s open", tdb1_name(tdb));
+                       diag("Already have tdb %s open", tdb->name);
                        return OTHER_FAILURE;
                }
                tdb = tdb1_open_ex(name, 0, TDB1_DEFAULT, O_RDWR, 0,
@@ -61,7 +61,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
        case FETCH:
                data = tdb1_fetch(tdb, k);
                if (data.dptr == NULL) {
-                       if (tdb->ecode == TDB1_ERR_NOEXIST)
+                       if (tdb->last_error == TDB_ERR_NOEXIST)
                                ret = FAILED;
                        else
                                ret = OTHER_FAILURE;