[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-433-gcdde2e4

[Michael Adam]

The branch, v3-2-test has been updated
       via  cdde2e4eaca51d51f036ad99d55df7bfd6535b03 (commit)
      from  3d2fdcd50fdbfb66a14360516836445d47eceeb0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit cdde2e4eaca51d51f036ad99d55df7bfd6535b03
Author: Michael Adam <obnox at samba.org>
Date:   Wed Mar 26 11:13:47 2008 +0100

    util_tdb: remove trivial and unused tdb_wipe().
    
    It has been replaced by tdb_wipe_all().
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/groupdb/mapping_tdb.c |    2 +-
 source/include/util_tdb.h    |    2 --
 source/lib/util_tdb.c        |   17 -----------------
 3 files changed, 1 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/groupdb/mapping_tdb.c b/source/groupdb/mapping_tdb.c
index 6732e3c..9f2b250 100644
--- a/source/groupdb/mapping_tdb.c
+++ b/source/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_wipe(tdb);
+			tdb_wipe_all(tdb);
 			tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
 		}
 
diff --git a/source/include/util_tdb.h b/source/include/util_tdb.h
index f9049c3..fcc723c 100644
--- a/source/include/util_tdb.h
+++ b/source/include/util_tdb.h
@@ -77,8 +77,6 @@ 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_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,
 			     TDB_DATA data, int flags);
diff --git a/source/lib/util_tdb.c b/source/lib/util_tdb.c
index e9c2d31..ce5e77f 100644
--- a/source/lib/util_tdb.c
+++ b/source/lib/util_tdb.c
@@ -719,23 +719,6 @@ TDB_CONTEXT *tdb_open_log(const char *name, int hash_size, int tdb_flags,
 	return tdb;
 }
 
-/****************************************************************************
- Allow tdb_delete to be used as a tdb_traversal_fn.
-****************************************************************************/
-
-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);
-}
-
-
-
 
 /**
  * Search across the whole tdb for keys that match the given pattern


-- 
Samba Shared Repository