X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Ftdb1-external-agent.c;h=18c76f1124d4d51f03740fa053fb809c433512c1;hb=a391b2b900bc6d5c0467869a454bdb5c51b5a3be;hp=3f73ae3aaf5b713caf40a3daf2c042830cf46ade;hpb=fab544c24c1ad6523f95893abcaec4e6cce6c2b4;p=ccan

diff --git a/ccan/tdb2/test/tdb1-external-agent.c b/ccan/tdb2/test/tdb1-external-agent.c
index 3f73ae3a..18c76f11 100644
--- a/ccan/tdb2/test/tdb1-external-agent.c
+++ b/ccan/tdb2/test/tdb1-external-agent.c
@@ -20,11 +20,11 @@ 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) {
+	if (op != OPEN && !tdb) {
 		diag("external: No tdb open!");
 		return OTHER_FAILURE;
 	}
@@ -36,10 +36,10 @@ 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,
+		tdb = tdb1_open_ex(name, 0, TDB_DEFAULT, O_RDWR, 0,
 				  &taplogctx, NULL);
 		if (!tdb) {
 			if (!locking_would_block1)
@@ -48,20 +48,13 @@ static enum agent_return do_operation(enum operation op, const char *name)
 		} else
 			ret = SUCCESS;
 		break;
-	case OPEN_WITH_CLEAR_IF_FIRST:
-		if (tdb)
-			return OTHER_FAILURE;
-		tdb = tdb1_open_ex(name, 0, TDB1_CLEAR_IF_FIRST, O_RDWR, 0,
-				  &taplogctx, NULL);
-		ret = tdb ? SUCCESS : OTHER_FAILURE;
-		break;
 	case TRANSACTION_START:
 		ret = tdb1_transaction_start(tdb) == 0 ? SUCCESS : OTHER_FAILURE;
 		break;
 	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;
@@ -183,7 +176,6 @@ const char *operation_name1(enum operation op)
 {
 	switch (op) {
 	case OPEN: return "OPEN";
-	case OPEN_WITH_CLEAR_IF_FIRST: return "OPEN_WITH_CLEAR_IF_FIRST";
 	case TRANSACTION_START: return "TRANSACTION_START";
 	case FETCH: return "FETCH";
 	case STORE: return "STORE";