diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:49:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:49:13 +0930 |
| commit | cbad6e2c140e59a6ec653bcfe773599a57a5042f (patch) | |
| tree | 84e7605464b76c0fabb18b89c7395f41d7514e5a /lib/tdb2/test/run-tdb1-die-during-transaction.c | |
| parent | 333a23fa995faf1735e5234272f56b792d91a877 (diff) | |
| download | samba-cbad6e2c140e59a6ec653bcfe773599a57a5042f.tar.gz samba-cbad6e2c140e59a6ec653bcfe773599a57a5042f.tar.bz2 samba-cbad6e2c140e59a6ec653bcfe773599a57a5042f.zip | |
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 <rusty@rustcorp.com.au>
(Imported from CCAN commit c8c3b3568677e8b0105f84e4ab068c580faf4591)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-die-during-transaction.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-die-during-transaction.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/tdb2/test/run-tdb1-die-during-transaction.c b/lib/tdb2/test/run-tdb1-die-during-transaction.c index 933d748686..4f54f6cbc6 100644 --- a/lib/tdb2/test/run-tdb1-die-during-transaction.c +++ b/lib/tdb2/test/run-tdb1-die-during-transaction.c @@ -28,7 +28,7 @@ static int ftruncate_check(int fd, off_t length); static bool in_transaction; static int target, current; static jmp_buf jmpbuf; -#define TEST_DBNAME "run-die-during-transaction.tdb" +#define TEST_DBNAME "run-die-during-transaction.tdb1" #define KEY_STRING "helloworld" static void maybe_die(int fd) @@ -94,8 +94,8 @@ static bool test_death(enum operation op, struct agent *agent) current = target = 0; reset: unlink(TEST_DBNAME); - tdb = tdb1_open(TEST_DBNAME, TDB_NOMMAP, - O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); + tdb = tdb_open(TEST_DBNAME, TDB_VERSION1|TDB_NOMMAP, + O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); if (setjmp(jmpbuf) != 0) { /* We're partway through. Simulate our death. */ @@ -144,7 +144,7 @@ reset: /* Suppress logging as this tries to use closed fd. */ suppress_logging = true; suppress_lockcheck1 = true; - tdb1_close(tdb); + tdb_close(tdb); suppress_logging = false; suppress_lockcheck1 = false; target++; @@ -183,7 +183,7 @@ reset: /* We made it! */ diag("Completed %u runs", current); - tdb1_close(tdb); + tdb_close(tdb); ret = external_agent_operation1(agent, CLOSE, ""); if (ret != SUCCESS) { diag("Step %u close failed = %s", current, |