From cbad6e2c140e59a6ec653bcfe773599a57a5042f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:49:13 +0930 Subject: tdb2: unify tdb1_open into tdb_open Finally, we gut tdb1_open() to the tdb1-specific parts, and call it from tdb_open if they specify the TDB_VERSION1 flag or the version is a TDB1. We also unify tdb_close(), based on the TDB_VERSION1 flag. Note that tdb_open(TDB_VERSION1) will fail on an existing tdb if it's a TDB2. Signed-off-by: Rusty Russell (Imported from CCAN commit c8c3b3568677e8b0105f84e4ab068c580faf4591) --- lib/tdb2/test/run-tdb1-summary.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tdb2/test/run-tdb1-summary.c') diff --git a/lib/tdb2/test/run-tdb1-summary.c b/lib/tdb2/test/run-tdb1-summary.c index 85194c8a88..45b4737286 100644 --- a/lib/tdb2/test/run-tdb1-summary.c +++ b/lib/tdb2/test/run-tdb1-summary.c @@ -16,8 +16,8 @@ int main(int argc, char *argv[]) plan_tests(sizeof(flags) / sizeof(flags[0]) * 14); for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) { - tdb = tdb1_open("run-summary.tdb", flags[i], - O_RDWR|O_CREAT|O_TRUNC, 0600, NULL); + tdb = tdb_open("run-summary.tdb1", flags[i]|TDB_VERSION1, + O_RDWR|O_CREAT|O_TRUNC, 0600, NULL); ok1(tdb); if (!tdb) continue; @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) ok1(strstr(summary, "Percentage keys/data/padding/free/dead/rechdrs&tailers/hashes: ")); free(summary); - tdb1_close(tdb); + tdb_close(tdb); } return exit_status(); -- cgit