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)

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index c9c8cdcaeb2faf31eba581f212473196d4f7cdfb..6732e3c42e0f0969c755623826b10034fb8c72d2 100644 (file)
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -76,7 +76,7 @@ static bool init_group_mapping(void)
                /* if its an unknown version we remove everthing in the db */
 
                if (vers_id != DATABASE_VERSION_V2) {
-                       tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
+                       tdb_wipe(tdb);
                        tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
                }
 

diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 4ed791b69bb9fa034f5c446371128505773aa5c5..0a8eb935a3bd653195c873c429e0005ee5ae7da3 100644 (file)
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -73,8 +73,7 @@ int32 tdb_change_int32_atomic(struct tdb_context *tdb, const char *keystr, int32
 bool tdb_change_uint32_atomic(TDB_CONTEXT *tdb, const char *keystr,
                              uint32 *oldval, uint32 change_val);
 
-int tdb_traverse_delete_fn(struct tdb_context *the_tdb, TDB_DATA key, TDB_DATA dbuf,
-                     void *state);
+int tdb_wipe(TDB_CONTEXT *tdb);
 
 int tdb_store_bystring(struct tdb_context *tdb, const char *keystr, TDB_DATA data, int flags);
 int tdb_trans_store_bystring(TDB_CONTEXT *tdb, const char *keystr,

diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index 6ad9ef8496b790f1d2dd7e7fbcdf8aa9d47ab897..4e4a3a5e2071cb6b154607ea9a7694a89337ff03 100644 (file)
--- a/source3/intl/lang_tdb.c
+++ b/source3/intl/lang_tdb.c
@@ -45,7 +45,7 @@ static bool load_msg(const char *msg_file)
        }
 
        /* wipe the db */
-       tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
+       tdb_wipe(tdb);
 
        msgid = NULL;
        

diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index f6ff701d5b79ae587dcab9c19950d2dfed7ed675..60f6e5077b8a1a015f6224edb60e99435a873972 100644 (file)
--- 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 4ecb4d5b8196bd572efb786321cba3fd06496cd4..4332a7948f5b5d4b2bf1746208270a2af375f1fa 100644 (file)
--- 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);
+}
+
+
 
 
 /**

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 221e79b3370b5d0438af6b11dfa87a2eaf0ea5f6..c9736b70bbc6cd95e94ee3dc7ebdb32d96ea5c3b 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -202,7 +202,7 @@ bool print_backend_init(struct messaging_context *msg_ctx)
                        return False;
                }
                if (tdb_fetch_int32(pdb->tdb, sversion) != PRINT_DATABASE_VERSION) {
-                       tdb_traverse(pdb->tdb, tdb_traverse_delete_fn, NULL);
+                       tdb_wipe(pdb->tdb);
                        tdb_store_int32(pdb->tdb, sversion, PRINT_DATABASE_VERSION);
                }
                tdb_unlock_bystring(pdb->tdb, sversion);