X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Ftdb1-external-agent.c;h=6f80b1933c15de9e399db94274c07d403df8f248;hp=18c76f1124d4d51f03740fa053fb809c433512c1;hb=08c05da588018c6b76834e57b66d525546643708;hpb=22d0e0dc59fc9d7e0046fec6971ef478c2d604fd

diff --git a/ccan/tdb2/test/tdb1-external-agent.c b/ccan/tdb2/test/tdb1-external-agent.c
index 18c76f11..6f80b193 100644
--- a/ccan/tdb2/test/tdb1-external-agent.c
+++ b/ccan/tdb2/test/tdb1-external-agent.c
@@ -1,6 +1,6 @@
 #include "tdb1-external-agent.h"
 #include "tdb1-lock-tracking.h"
-#include "tdb1-logging.h"
+#include "logging.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-static struct tdb1_context *tdb;
+static struct tdb_context *tdb;
 
 static enum agent_return do_operation(enum operation op, const char *name)
 {
@@ -39,8 +39,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
 			diag("Already have tdb %s open", tdb->name);
 			return OTHER_FAILURE;
 		}
-		tdb = tdb1_open_ex(name, 0, TDB_DEFAULT, O_RDWR, 0,
-				  &taplogctx, NULL);
+		tdb = tdb_open(name, TDB_VERSION1, O_RDWR, 0, &tap_log_attr);
 		if (!tdb) {
 			if (!locking_would_block1)
 				diag("Opening tdb gave %s", strerror(errno));
@@ -52,8 +51,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
 		ret = tdb1_transaction_start(tdb) == 0 ? SUCCESS : OTHER_FAILURE;
 		break;
 	case FETCH:
-		data = tdb1_fetch(tdb, k);
-		if (data.dptr == NULL) {
+		if (tdb_fetch(tdb, k, &data) != TDB_SUCCESS) {
 			if (tdb->last_error == TDB_ERR_NOEXIST)
 				ret = FAILED;
 			else
@@ -67,7 +65,10 @@ static enum agent_return do_operation(enum operation op, const char *name)
 		free(data.dptr);
 		break;
 	case STORE:
-		ret = tdb1_store(tdb, k, k, 0) == 0 ? SUCCESS : OTHER_FAILURE;
+		if (tdb_store(tdb, k, k, 0) == TDB_SUCCESS)
+			ret = SUCCESS;
+		else
+			ret = OTHER_FAILURE;
 		break;
 	case TRANSACTION_COMMIT:
 		ret = tdb1_transaction_commit(tdb)==0 ? SUCCESS : OTHER_FAILURE;
@@ -79,7 +80,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
 		ret = tdb1_needs_recovery(tdb) ? SUCCESS : FAILED;
 		break;
 	case CLOSE:
-		ret = tdb1_close(tdb) == 0 ? SUCCESS : OTHER_FAILURE;
+		ret = tdb_close(tdb) == 0 ? SUCCESS : OTHER_FAILURE;
 		tdb = NULL;
 		break;
 	default: