diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-18 22:30:25 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:05 +0200 |
commit | cab6e116786641e28747de3f70c8cd89ba17673f (patch) | |
tree | e41622bfd16ed94a6bb67a91a409ac970a22c533 /lib/tdb2/tdb.c | |
parent | 6244f668a34279e6da62213333dfb32c3ccdb17d (diff) | |
download | samba-cab6e116786641e28747de3f70c8cd89ba17673f.tar.gz samba-cab6e116786641e28747de3f70c8cd89ba17673f.tar.bz2 samba-cab6e116786641e28747de3f70c8cd89ba17673f.zip |
TDB2: remove TDB1 compatibility.
This rips out all the TDB1 compatibility from tdb2.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/tdb.c')
-rw-r--r-- | lib/tdb2/tdb.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c index 4ba6924645..98d1ad6c66 100644 --- a/lib/tdb2/tdb.c +++ b/lib/tdb2/tdb.c @@ -116,12 +116,6 @@ _PUBLIC_ enum TDB_ERROR tdb_store(struct tdb_context *tdb, struct tdb_used_record rec; enum TDB_ERROR ecode; - if (tdb->flags & TDB_VERSION1) { - if (tdb1_store(tdb, key, dbuf, flag) == -1) - return tdb->last_error; - return TDB_SUCCESS; - } - off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = TDB_OFF_TO_ERR(off); @@ -185,12 +179,6 @@ _PUBLIC_ enum TDB_ERROR tdb_append(struct tdb_context *tdb, struct tdb_data new_dbuf; enum TDB_ERROR ecode; - if (tdb->flags & TDB_VERSION1) { - if (tdb1_append(tdb, key, dbuf) == -1) - return tdb->last_error; - return TDB_SUCCESS; - } - off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = TDB_OFF_TO_ERR(off); @@ -256,9 +244,6 @@ _PUBLIC_ enum TDB_ERROR tdb_fetch(struct tdb_context *tdb, struct tdb_data key, struct hash_info h; enum TDB_ERROR ecode; - if (tdb->flags & TDB_VERSION1) - return tdb1_fetch(tdb, key, data); - off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = TDB_OFF_TO_ERR(off); @@ -286,10 +271,6 @@ _PUBLIC_ bool tdb_exists(struct tdb_context *tdb, TDB_DATA key) struct tdb_used_record rec; struct hash_info h; - if (tdb->flags & TDB_VERSION1) { - return tdb1_exists(tdb, key); - } - off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { tdb->last_error = TDB_OFF_TO_ERR(off); @@ -308,12 +289,6 @@ _PUBLIC_ enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key) struct hash_info h; enum TDB_ERROR ecode; - if (tdb->flags & TDB_VERSION1) { - if (tdb1_delete(tdb, key) == -1) - return tdb->last_error; - return TDB_SUCCESS; - } - off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = TDB_OFF_TO_ERR(off); @@ -353,10 +328,7 @@ _PUBLIC_ unsigned int tdb_get_flags(struct tdb_context *tdb) static bool inside_transaction(const struct tdb_context *tdb) { - if (tdb->flags & TDB_VERSION1) - return tdb->tdb1.transaction != NULL; - else - return tdb->tdb2.transaction != NULL; + return tdb->tdb2.transaction != NULL; } static bool readonly_changable(struct tdb_context *tdb, const char *caller) @@ -523,11 +495,6 @@ _PUBLIC_ enum TDB_ERROR tdb_parse_record_(struct tdb_context *tdb, struct hash_info h; enum TDB_ERROR ecode; - if (tdb->flags & TDB_VERSION1) { - return tdb->last_error = tdb1_parse_record(tdb, key, parse, - data); - } - off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = TDB_OFF_TO_ERR(off); @@ -562,17 +529,6 @@ _PUBLIC_ int64_t tdb_get_seqnum(struct tdb_context *tdb) { tdb_off_t off; - if (tdb->flags & TDB_VERSION1) { - tdb1_off_t val; - tdb->last_error = TDB_SUCCESS; - val = tdb1_get_seqnum(tdb); - - if (tdb->last_error != TDB_SUCCESS) - return TDB_ERR_TO_OFF(tdb->last_error); - else - return val; - } - off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum)); if (TDB_OFF_IS_ERR(off)) tdb->last_error = TDB_OFF_TO_ERR(off); |