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-hashsize.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-hashsize.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-hashsize.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/tdb2/test/run-tdb1-hashsize.c b/lib/tdb2/test/run-tdb1-hashsize.c index fc48c23076..8a78196c82 100644 --- a/lib/tdb2/test/run-tdb1-hashsize.c +++ b/lib/tdb2/test/run-tdb1-hashsize.c @@ -14,8 +14,8 @@ int main(int argc, char *argv[]) hsize.tdb1_hashsize.hsize = 1024; plan_tests(14); - tdb = tdb1_open("run-tdb1-hashsize.tdb1", TDB_DEFAULT, - O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); + tdb = tdb_open("run-tdb1-hashsize.tdb1", TDB_VERSION1, + O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); ok1(tdb); h2.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE; ok1(tdb_get_attribute(tdb, &h2) == TDB_SUCCESS); @@ -23,8 +23,8 @@ int main(int argc, char *argv[]) tdb_close(tdb); /* Can't specify TDB_ATTRIBUTE_TDB1_HASHSIZE without O_CREAT */ - tdb = tdb1_open("run-tdb1-hashsize.tdb1", TDB_DEFAULT, - O_RDWR, 0600, &hsize); + tdb = tdb_open("run-tdb1-hashsize.tdb1", TDB_VERSION1, + O_RDWR, 0600, &hsize); ok1(!tdb); ok1(tap_log_messages == 1); @@ -35,8 +35,8 @@ int main(int argc, char *argv[]) ok1(tap_log_messages == 2); /* We can get attribute even if we didn't set it though. */ - tdb = tdb1_open("run-tdb1-hashsize.tdb1", TDB_DEFAULT, - O_RDWR, 0600, &tap_log_attr); + tdb = tdb_open("run-tdb1-hashsize.tdb1", TDB_DEFAULT, + O_RDWR, 0600, &tap_log_attr); ok1(tdb); memset(&h2, 0, sizeof(h2)); @@ -46,8 +46,8 @@ int main(int argc, char *argv[]) tdb_close(tdb); /* Check for default hash size. */ - tdb = tdb1_open("run-tdb1-hashsize.tdb1", TDB_DEFAULT, - O_CREAT|O_TRUNC|O_RDWR, 0600, &tap_log_attr); + tdb = tdb_open("run-tdb1-hashsize.tdb1", TDB_VERSION1, + O_CREAT|O_TRUNC|O_RDWR, 0600, &tap_log_attr); ok1(tdb); memset(&h2, 0, sizeof(h2)); |