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.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tdb2/test/run-tdb1.c') diff --git a/lib/tdb2/test/run-tdb1.c b/lib/tdb2/test/run-tdb1.c index ebbfd77bb2..30de924cd2 100644 --- a/lib/tdb2/test/run-tdb1.c +++ b/lib/tdb2/test/run-tdb1.c @@ -20,10 +20,10 @@ int main(int argc, char *argv[]) data.dptr = (void *)"world"; ok1(tdb1_store(tdb, key, data, TDB1_MODIFY) < 0); - ok1(tdb1_error(tdb) == TDB1_ERR_NOEXIST); + ok1(tdb_error(tdb) == TDB_ERR_NOEXIST); ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0); ok1(tdb1_store(tdb, key, data, TDB1_INSERT) < 0); - ok1(tdb1_error(tdb) == TDB1_ERR_EXISTS); + ok1(tdb_error(tdb) == TDB_ERR_EXISTS); ok1(tdb1_store(tdb, key, data, TDB1_MODIFY) == 0); data = tdb1_fetch(tdb, key); -- cgit