From e613effeae7c9373c9e635fc708ec2ce29661d4c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:32:13 +0930 Subject: tdb2: make TDB1 code use tdb2's TDB_ERROR and tdb_logerr() To do this, we make sure that the first few fields of tdb1_context and tdb_context are the same. This sweep also fixes up a few paths where we weren't setting tdb->ecode before our old logging function. Signed-off-by: Rusty Russell (Imported from CCAN commit 919937354a331bb964564a11b5a5b80403ff8db9) --- lib/tdb2/test/run-tdb1-nested-transactions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tdb2/test/run-tdb1-nested-transactions.c') diff --git a/lib/tdb2/test/run-tdb1-nested-transactions.c b/lib/tdb2/test/run-tdb1-nested-transactions.c index 2518003c63..e9640990e0 100644 --- a/lib/tdb2/test/run-tdb1-nested-transactions.c +++ b/lib/tdb2/test/run-tdb1-nested-transactions.c @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) ok1(memcmp(data.dptr, "world", strlen("world")) == 0); free(data.dptr); ok1(tdb1_transaction_start(tdb) != 0); - ok1(tdb1_error(tdb) == TDB1_ERR_NESTING); + ok1(tdb_error(tdb) == TDB_ERR_EINVAL); data = tdb1_fetch(tdb, key); ok1(data.dsize == strlen("world")); -- cgit