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/traverse.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/traverse.c')
-rw-r--r-- | lib/tdb2/traverse.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/lib/tdb2/traverse.c b/lib/tdb2/traverse.c index a93e4d1d68..ed51a9ee72 100644 --- a/lib/tdb2/traverse.c +++ b/lib/tdb2/traverse.c @@ -28,13 +28,6 @@ _PUBLIC_ int64_t tdb_traverse_(struct tdb_context *tdb, struct tdb_data k, d; int64_t count = 0; - if (tdb->flags & TDB_VERSION1) { - count = tdb1_traverse(tdb, fn, p); - if (count == -1) - return TDB_ERR_TO_OFF(tdb->last_error); - return count; - } - k.dptr = NULL; for (ecode = first_in_hash(tdb, &tinfo, &k, &d.dsize); ecode == TDB_SUCCESS; @@ -61,16 +54,6 @@ _PUBLIC_ enum TDB_ERROR tdb_firstkey(struct tdb_context *tdb, struct tdb_data *k { struct traverse_info tinfo; - if (tdb->flags & TDB_VERSION1) { - tdb->last_error = TDB_SUCCESS; - *key = tdb1_firstkey(tdb); - /* TDB1 didn't set error for last key. */ - if (!key->dptr && tdb->last_error == TDB_SUCCESS) { - tdb->last_error = TDB_ERR_NOEXIST; - } - return tdb->last_error; - } - return tdb->last_error = first_in_hash(tdb, &tinfo, key, NULL); } @@ -81,18 +64,6 @@ _PUBLIC_ enum TDB_ERROR tdb_nextkey(struct tdb_context *tdb, struct tdb_data *ke struct hash_info h; struct tdb_used_record rec; - if (tdb->flags & TDB_VERSION1) { - struct tdb_data last_key = *key; - tdb->last_error = TDB_SUCCESS; - *key = tdb1_nextkey(tdb, last_key); - free(last_key.dptr); - /* TDB1 didn't set error for last key. */ - if (!key->dptr && tdb->last_error == TDB_SUCCESS) { - tdb->last_error = TDB_ERR_NOEXIST; - } - return tdb->last_error; - } - tinfo.prev = find_and_lock(tdb, *key, F_RDLCK, &h, &rec, &tinfo); free(key->dptr); if (TDB_OFF_IS_ERR(tinfo.prev)) { @@ -115,12 +86,6 @@ _PUBLIC_ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb) enum TDB_ERROR ecode; int64_t count; - if (tdb->flags & TDB_VERSION1) { - if (tdb1_wipe_all(tdb) == -1) - return tdb->last_error; - return TDB_SUCCESS; - } - ecode = tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false); if (ecode != TDB_SUCCESS) return tdb->last_error = ecode; |