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-incompatible.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-incompatible.c')
-rw-r--r-- | lib/tdb2/test/run-tdb1-incompatible.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/lib/tdb2/test/run-tdb1-incompatible.c b/lib/tdb2/test/run-tdb1-incompatible.c index 48f796dbf4..350c78b2b4 100644 --- a/lib/tdb2/test/run-tdb1-incompatible.c +++ b/lib/tdb2/test/run-tdb1-incompatible.c @@ -83,86 +83,86 @@ int main(int argc, char *argv[]) /* Create an old-style hash. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", flags, - O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr); + tdb = tdb_open("run-incompatible.tdb1", flags|TDB_VERSION1, + O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr); ok1(tdb); ok1(log_count == 0); d.dptr = (void *)"Hello"; d.dsize = 5; ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0); - tdb1_close(tdb); + tdb_close(tdb); /* Should not have marked rwlocks field. */ - ok1(hdr_rwlocks("run-incompatible.tdb") == 0); + ok1(hdr_rwlocks("run-incompatible.tdb1") == 0); /* We can still open any old-style with incompat hash. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", - TDB_DEFAULT, - O_RDWR, 0600, &incompat_hash_attr); + tdb = tdb_open("run-incompatible.tdb1", + TDB_VERSION1, + O_RDWR, 0600, &incompat_hash_attr); ok1(tdb); ok1(log_count == 0); d = tdb1_fetch(tdb, d); ok1(d.dsize == 5); free(d.dptr); ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + tdb_close(tdb); log_count = 0; - tdb = tdb1_open("test/jenkins-le-hash.tdb1", 0, O_RDONLY, - 0, &jhash_attr); + tdb = tdb_open("test/jenkins-le-hash.tdb1", + TDB_VERSION1, O_RDONLY, 0, &jhash_attr); ok1(tdb); ok1(log_count == 0); ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + tdb_close(tdb); log_count = 0; - tdb = tdb1_open("test/jenkins-be-hash.tdb1", 0, O_RDONLY, - 0, &jhash_attr); + tdb = tdb_open("test/jenkins-be-hash.tdb1", + TDB_VERSION1, O_RDONLY, 0, &jhash_attr); ok1(tdb); ok1(log_count == 0); ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + tdb_close(tdb); /* OK, now create with incompatible hash. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", - flags, - O_CREAT|O_RDWR|O_TRUNC, 0600, - &incompat_hash_attr); + tdb = tdb_open("run-incompatible.tdb1", + flags|TDB_VERSION1, + O_CREAT|O_RDWR|O_TRUNC, 0600, + &incompat_hash_attr); ok1(tdb); ok1(log_count == 0); d.dptr = (void *)"Hello"; d.dsize = 5; ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0); - tdb1_close(tdb); + tdb_close(tdb); /* Should have marked rwlocks field. */ - ok1(hdr_rwlocks("run-incompatible.tdb") == rwmagic); + ok1(hdr_rwlocks("run-incompatible.tdb1") == rwmagic); /* Cannot open with old hash. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", 0, - O_RDWR, 0600, &ohash_attr); + tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, + O_RDWR, 0600, &ohash_attr); ok1(!tdb); ok1(log_count == 1); /* Can open with jenkins hash. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", 0, - O_RDWR, 0600, &jhash_attr); + tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, + O_RDWR, 0600, &jhash_attr); ok1(tdb); ok1(log_count == 0); d = tdb1_fetch(tdb, d); ok1(d.dsize == 5); free(d.dptr); ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + tdb_close(tdb); /* Can open by letting it figure it out itself. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", 0, - O_RDWR, 0600, &log_attr); + tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, + O_RDWR, 0600, &log_attr); ok1(tdb); ok1(log_count == 0); d.dptr = (void *)"Hello"; @@ -171,42 +171,42 @@ int main(int argc, char *argv[]) ok1(d.dsize == 5); free(d.dptr); ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + tdb_close(tdb); /* FIXME: Not possible with TDB2 :( */ /* We can also use incompatible hash with other hashes. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", - flags, - O_CREAT|O_RDWR|O_TRUNC, 0600, &dumbhash_attr); + tdb = tdb_open("run-incompatible.tdb1", + flags|TDB_VERSION1, + O_CREAT|O_RDWR|O_TRUNC, 0600, &dumbhash_attr); ok1(tdb); ok1(log_count == 0); d.dptr = (void *)"Hello"; d.dsize = 5; ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0); - tdb1_close(tdb); + tdb_close(tdb); /* FIXME: Should have marked rwlocks field. */ - ok1(hdr_rwlocks("run-incompatible.tdb") != rwmagic); + ok1(hdr_rwlocks("run-incompatible.tdb1") != rwmagic); /* It should not open if we don't specify. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", 0, O_RDWR, 0, - &log_attr); + tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, O_RDWR, 0, + &log_attr); ok1(!tdb); ok1(log_count == 1); /* Should reopen with correct hash. */ log_count = 0; - tdb = tdb1_open("run-incompatible.tdb", 0, O_RDWR, 0, - &dumbhash_attr); + tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, O_RDWR, 0, + &dumbhash_attr); ok1(tdb); ok1(log_count == 0); d = tdb1_fetch(tdb, d); ok1(d.dsize == 5); free(d.dptr); ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + tdb_close(tdb); } return exit_status(); |