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-readonly-check.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-readonly-check.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-readonly-check.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/tdb2/test/run-tdb1-readonly-check.c b/lib/tdb2/test/run-tdb1-readonly-check.c index b712e48aa3..9bc9a93a7f 100644 --- a/lib/tdb2/test/run-tdb1-readonly-check.c +++ b/lib/tdb2/test/run-tdb1-readonly-check.c @@ -17,9 +17,9 @@ int main(int argc, char *argv[]) hsize.tdb1_hashsize.hsize = 1024; plan_tests(11); - tdb = tdb1_open("run-readonly-check.tdb", - TDB_DEFAULT, - O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); + tdb = tdb_open("run-readonly-check.tdb1", + TDB_VERSION1, + O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); ok1(tdb); key.dsize = strlen("hi"); @@ -33,16 +33,16 @@ int main(int argc, char *argv[]) /* We are also allowed to do a check inside a transaction. */ ok1(tdb1_transaction_start(tdb) == 0); ok1(tdb1_check(tdb, NULL, NULL) == 0); - ok1(tdb1_close(tdb) == 0); + ok1(tdb_close(tdb) == 0); - tdb = tdb1_open("run-readonly-check.tdb", - TDB_DEFAULT, O_RDONLY, 0, &tap_log_attr); + tdb = tdb_open("run-readonly-check.tdb1", + TDB_DEFAULT, O_RDONLY, 0, &tap_log_attr); ok1(tdb); ok1(tdb1_store(tdb, key, data, TDB_MODIFY) == -1); ok1(tdb_error(tdb) == TDB_ERR_RDONLY); ok1(tdb1_check(tdb, NULL, NULL) == 0); - ok1(tdb1_close(tdb) == 0); + ok1(tdb_close(tdb) == 0); return exit_status(); } |