diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:55:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:55:13 +0930 |
| commit | 30294c7b91456dd49b89a9b26eb0b1066087815c (patch) | |
| tree | 8bf72d6834fafb9e030d120e7f6c881068cdb3af /lib/tdb2/tdb1_tdb.c | |
| parent | e6cbc0f00ec9ecb4c014ee484746d565382d5f67 (diff) | |
| download | samba-30294c7b91456dd49b89a9b26eb0b1066087815c.tar.gz samba-30294c7b91456dd49b89a9b26eb0b1066087815c.tar.bz2 samba-30294c7b91456dd49b89a9b26eb0b1066087815c.zip | |
tdb2: unify tdb1_traverse into tdb_traverse
Switch on the TDB_VERSION1 flag; we now only do a tdb1_traverse_read on a
read-only database, as there is no tdb2 equivalent.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit cc2d609dfca7192305ad477b8c2b52cfdc1aa9be)
Diffstat (limited to 'lib/tdb2/tdb1_tdb.c')
| -rw-r--r-- | lib/tdb2/tdb1_tdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tdb2/tdb1_tdb.c b/lib/tdb2/tdb1_tdb.c index 2c989bb9a4..d7f518dce4 100644 --- a/lib/tdb2/tdb1_tdb.c +++ b/lib/tdb2/tdb1_tdb.c @@ -862,7 +862,7 @@ int tdb1_repack(struct tdb_context *tdb) state.error = TDB_SUCCESS; state.dest_db = tmp_db; - if (tdb1_traverse_read(tdb, repack_traverse, &state) == -1) { + if (tdb1_traverse(tdb, repack_traverse, &state) == -1) { tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR, __location__ " Failed to traverse copying out"); tdb1_transaction_cancel(tdb); @@ -889,7 +889,7 @@ int tdb1_repack(struct tdb_context *tdb) state.error = TDB_SUCCESS; state.dest_db = tdb; - if (tdb1_traverse_read(tmp_db, repack_traverse, &state) == -1) { + if (tdb1_traverse(tmp_db, repack_traverse, &state) == -1) { tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR, __location__ " Failed to traverse copying back"); tdb1_transaction_cancel(tdb); |