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/tdb1-external-agent.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/tdb1-external-agent.c')
| -rw-r--r-- | lib/tdb2/test/tdb1-external-agent.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/tdb2/test/tdb1-external-agent.c b/lib/tdb2/test/tdb1-external-agent.c index 44bdeceaad..eb52e55f62 100644 --- a/lib/tdb2/test/tdb1-external-agent.c +++ b/lib/tdb2/test/tdb1-external-agent.c @@ -39,8 +39,7 @@ static enum agent_return do_operation(enum operation op, const char *name) diag("Already have tdb %s open", tdb->name); return OTHER_FAILURE; } - tdb = tdb1_open(name, TDB_DEFAULT, O_RDWR, 0, - &tap_log_attr); + tdb = tdb_open(name, TDB_VERSION1, O_RDWR, 0, &tap_log_attr); if (!tdb) { if (!locking_would_block1) diag("Opening tdb gave %s", strerror(errno)); @@ -79,7 +78,7 @@ static enum agent_return do_operation(enum operation op, const char *name) ret = tdb1_needs_recovery(tdb) ? SUCCESS : FAILED; break; case CLOSE: - ret = tdb1_close(tdb) == 0 ? SUCCESS : OTHER_FAILURE; + ret = tdb_close(tdb) == 0 ? SUCCESS : OTHER_FAILURE; tdb = NULL; break; default: |