summaryrefslogtreecommitdiff
path: root/lib/tdb2/open.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-18 22:30:26 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-19 05:38:05 +0200
commitc3dcdf08f3472748c9e7984488398064abcd454a (patch)
tree3c7ea8afbb00cfae914bd7011d0a4b1321764133 /lib/tdb2/open.c
parentcab6e116786641e28747de3f70c8cd89ba17673f (diff)
downloadsamba-c3dcdf08f3472748c9e7984488398064abcd454a.tar.gz
samba-c3dcdf08f3472748c9e7984488398064abcd454a.tar.bz2
samba-c3dcdf08f3472748c9e7984488398064abcd454a.zip
TDB2: more internal cleanups after TDB1 compatibility removal.
This eliminates the separate tdb2 substructure, and makes some tdb1-required functions static. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/open.c')
-rw-r--r--lib/tdb2/open.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/tdb2/open.c b/lib/tdb2/open.c
index 023dc7fe7d..fab855b6b8 100644
--- a/lib/tdb2/open.c
+++ b/lib/tdb2/open.c
@@ -100,9 +100,9 @@ static void tdb2_context_init(struct tdb_context *tdb)
{
/* Initialize the TDB2 fields here */
tdb_io_init(tdb);
- tdb->tdb2.direct_access = 0;
- tdb->tdb2.transaction = NULL;
- tdb->tdb2.access = NULL;
+ tdb->direct_access = 0;
+ tdb->transaction = NULL;
+ tdb->access = NULL;
}
struct new_database {
@@ -640,7 +640,7 @@ _PUBLIC_ struct tdb_context *tdb_open(const char *name, int tdb_flags,
tdb_unlock_open(tdb, openlock);
/* This makes sure we have current map_size and mmap. */
- ecode = tdb->tdb2.io->oob(tdb, tdb->file->map_size, 1, true);
+ ecode = tdb->io->oob(tdb, tdb->file->map_size, 1, true);
if (unlikely(ecode != TDB_SUCCESS))
goto fail;
@@ -722,7 +722,7 @@ _PUBLIC_ int tdb_close(struct tdb_context *tdb)
tdb_trace(tdb, "tdb_close");
- if (tdb->tdb2.transaction) {
+ if (tdb->transaction) {
tdb_transaction_cancel(tdb);
}