X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Ftdb1-external-agent.c;h=ffde0770255f4b5be717a11de721b1ad557e0e65;hp=eb52e55f62799381d1069acdd243a1aed5bcad9f;hb=b8e64e9346793164651a36eccb3c205077e5c91b;hpb=c8c3b3568677e8b0105f84e4ab068c580faf4591

diff --git a/ccan/tdb2/test/tdb1-external-agent.c b/ccan/tdb2/test/tdb1-external-agent.c
index eb52e55f..ffde0770 100644
--- a/ccan/tdb2/test/tdb1-external-agent.c
+++ b/ccan/tdb2/test/tdb1-external-agent.c
@@ -10,7 +10,6 @@
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
-#include <ccan/tdb2/tdb1.h>
 #include <ccan/tdb2/tdb1_private.h>
 #include <ccan/tap/tap.h>
 #include <stdio.h>
@@ -48,11 +47,10 @@ static enum agent_return do_operation(enum operation op, const char *name)
 			ret = SUCCESS;
 		break;
 	case TRANSACTION_START:
-		ret = tdb1_transaction_start(tdb) == 0 ? SUCCESS : OTHER_FAILURE;
+		ret = tdb_transaction_start(tdb) == TDB_SUCCESS ? 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
@@ -66,13 +64,16 @@ 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;
+		ret = tdb_transaction_commit(tdb) == TDB_SUCCESS ? SUCCESS : OTHER_FAILURE;
 		break;
 	case CHECK:
-		ret = tdb1_check(tdb, NULL, NULL) == 0 ? SUCCESS : OTHER_FAILURE;
+		ret = tdb_check(tdb, NULL, NULL) == TDB_SUCCESS ? SUCCESS : OTHER_FAILURE;
 		break;
 	case NEEDS_RECOVERY:
 		ret = tdb1_needs_recovery(tdb) ? SUCCESS : FAILED;