X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftraverse.c;h=c605c8e6a3b5b02344a662d492ad31f3497043cf;hp=1ca88d71b6326a6cf1a7f67170d030800c26a0c6;hb=8458811a4126c22635b974718bfbf2876c893c37;hpb=b2c0ebc6f53b05b222937991f100f8a89701f9b1

diff --git a/ccan/tdb/traverse.c b/ccan/tdb/traverse.c
index 1ca88d71..c605c8e6 100644
--- a/ccan/tdb/traverse.c
+++ b/ccan/tdb/traverse.c
@@ -32,14 +32,14 @@
 /* Uses traverse lock: 0 = finish, TDB_NEXT_LOCK_ERR = error,
    other = record offset */
 static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock *tlock,
-			 struct list_struct *rec)
+			 struct tdb_record *rec)
 {
 	int want_next = (tlock->off != 0);
 
 	/* Lock each chain from the start one. */
 	for (; tlock->hash < tdb->header.hash_size; tlock->hash++) {
 		if (!tlock->off && tlock->hash != 0) {
-			/* this is an optimisation for the common case where
+			/* this is an optimization for the common case where
 			   the hash chain is empty, which is particularly
 			   common for the use of tdb with ldb, where large
 			   hashes are used. In that case we spend most of our
@@ -53,7 +53,7 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock
 			   lock, so instead we get the lock and re-fetch the
 			   value below.
 			   
-			   Notice that not doing this optimisation on the
+			   Notice that not doing this optimization on the
 			   first hash chain is critical. We must guarantee
 			   that we have done at least one fcntl lock at the
 			   start of a search to guarantee that memory is
@@ -140,12 +140,12 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock
    if fn is NULL then it is not called
    a non-zero return value from fn() indicates that the traversal should stop
   */
-static int _tdb_traverse(struct tdb_context *tdb, 
-			 tdb_traverse_func fn, void *private_data,
-			 struct tdb_traverse_lock *tl)
+static int tdb_traverse_internal(struct tdb_context *tdb, 
+				 tdb_traverse_func fn, void *private_data,
+				 struct tdb_traverse_lock *tl)
 {
 	TDB_DATA key, dbuf;
-	struct list_struct rec;
+	struct tdb_record rec;
 	int ret = 0, count = 0;
 	tdb_off_t off;
 
@@ -226,7 +226,7 @@ int tdb_traverse_read(struct tdb_context *tdb,
 
 	tdb->traverse_read++;
 	tdb_trace(tdb, "tdb_traverse_read_start");
-	ret = _tdb_traverse(tdb, fn, private_data, &tl);
+	ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
 	tdb->traverse_read--;
 
 	tdb_transaction_unlock(tdb, F_RDLCK);
@@ -257,7 +257,7 @@ int tdb_traverse(struct tdb_context *tdb,
 
 	tdb->traverse_write++;
 	tdb_trace(tdb, "tdb_traverse_start");
-	ret = _tdb_traverse(tdb, fn, private_data, &tl);
+	ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
 	tdb->traverse_write--;
 
 	tdb_transaction_unlock(tdb, F_WRLCK);
@@ -270,7 +270,7 @@ int tdb_traverse(struct tdb_context *tdb,
 TDB_DATA tdb_firstkey(struct tdb_context *tdb)
 {
 	TDB_DATA key;
-	struct list_struct rec;
+	struct tdb_record rec;
 	tdb_off_t off;
 
 	/* release any old lock */
@@ -302,7 +302,7 @@ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
 {
 	uint32_t oldhash;
 	TDB_DATA key = tdb_null;
-	struct list_struct rec;
+	struct tdb_record rec;
 	unsigned char *k = NULL;
 	tdb_off_t off;