diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-25 14:18:08 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-03-25 15:55:34 +0100 |
| commit | aaa59713155b63b2597f955622be9019bb3cbe89 (patch) | |
| tree | 387265c33a331aa940f4f1984f2b2fd67c594b54 /source3/lib | |
| parent | 2d02e5a16d53072a73d0d864da9b90dd3dad994a (diff) | |
| download | samba-aaa59713155b63b2597f955622be9019bb3cbe89.tar.gz samba-aaa59713155b63b2597f955622be9019bb3cbe89.tar.bz2 samba-aaa59713155b63b2597f955622be9019bb3cbe89.zip | |
util_tdb: add a wrapper tdb_wipe() for traverse with tdb_traverse_delete_fn().
Replace all callers of traverse with this tdb_traverse_delete_fn() and
don't export tdb_traverse_delete_fn() anymore.
Michael
(This used to be commit d4be4e30cd8c3bdc303da30e42280f892a45a8c9)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/sharesec.c | 2 | ||||
| -rw-r--r-- | source3/lib/util_tdb.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index f6ff701d5b..60f6e5077b 100644 --- a/source3/lib/sharesec.c +++ b/source3/lib/sharesec.c @@ -65,7 +65,7 @@ static bool share_info_db_init(void) } if (vers_id != SHARE_DATABASE_VERSION_V2) { - tdb_traverse(share_tdb, tdb_traverse_delete_fn, NULL); + tdb_wipe(share_tdb); tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2); } tdb_unlock_bystring(share_tdb, vstring); diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index 4ecb4d5b81..4332a7948f 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -722,12 +722,18 @@ TDB_CONTEXT *tdb_open_log(const char *name, int hash_size, int tdb_flags, Allow tdb_delete to be used as a tdb_traversal_fn. ****************************************************************************/ -int tdb_traverse_delete_fn(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, - void *state) +static int tdb_traverse_delete_fn(TDB_CONTEXT *the_tdb, TDB_DATA key, + TDB_DATA dbuf, void *state) { return tdb_delete(the_tdb, key); } +int tdb_wipe(TDB_CONTEXT *tdb) +{ + return tdb_traverse(tdb, tdb_traverse_delete_fn, NULL); +} + + /** |