tdb2: unify tdb1_traverse into tdb_traverse

[ccan] / ccan / tdb2 / tdb1_traverse.c

diff --git a/ccan/tdb2/tdb1_traverse.c b/ccan/tdb2/tdb1_traverse.c
index 87e233b47fe3fa4551b11db6adee922fc242978e..63052854d5428aef78b589667f5c51d3fc3ade3f 100644 (file)
--- a/ccan/tdb2/tdb1_traverse.c
+++ b/ccan/tdb2/tdb1_traverse.c
@@ -144,8 +144,10 @@ static tdb1_off_t tdb1_next_lock(struct tdb_context *tdb, struct tdb1_traverse_l
    a non-zero return value from fn() indicates that the traversal should stop
   */
 static int tdb1_traverse_internal(struct tdb_context *tdb,
    a non-zero return value from fn() indicates that the traversal should stop
   */
 static int tdb1_traverse_internal(struct tdb_context *tdb,

-                                tdb1_traverse_func fn, void *private_data,
-                                struct tdb1_traverse_lock *tl)
+                                 int (*fn)(struct tdb_context *,
+                                           TDB_DATA, TDB_DATA, void *),
+                                 void *private_data,
+                                 struct tdb1_traverse_lock *tl)

 {
        TDB_DATA key, dbuf;
        struct tdb1_record rec;
 {
        TDB_DATA key, dbuf;
        struct tdb1_record rec;


@@ -213,10 +215,12 @@ out:
 
 
 /*
 
 
 /*

-  a write style traverse - temporarily marks the db read only
+  a read style traverse - only if db read only

 */
 */

-int tdb1_traverse_read(struct tdb_context *tdb,
-                     tdb1_traverse_func fn, void *private_data)
+static int tdb1_traverse_read(struct tdb_context *tdb,
+                             int (*fn)(struct tdb_context *,
+                                       TDB_DATA, TDB_DATA, void *),
+                             void *private_data)

 {
        struct tdb1_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
        int ret;
 {
        struct tdb1_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
        int ret;


@@ -244,12 +248,14 @@ int tdb1_traverse_read(struct tdb_context *tdb,
   alignment restrictions malloc gives you.
 */
 int tdb1_traverse(struct tdb_context *tdb,
   alignment restrictions malloc gives you.
 */
 int tdb1_traverse(struct tdb_context *tdb,

-                tdb1_traverse_func fn, void *private_data)
+                 int (*fn)(struct tdb_context *, TDB_DATA, TDB_DATA, void *),
+                 void *private_data)

 {
        struct tdb1_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
        int ret;
 
 {
        struct tdb1_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
        int ret;
 

-       if ((tdb->flags & TDB_RDONLY) || tdb->tdb1.traverse_read) {
+       /* If we're read-only, we don't have to write-lock whole db. */
+       if (tdb->flags & TDB_RDONLY) {

                return tdb1_traverse_read(tdb, fn, private_data);
        }
 
                return tdb1_traverse_read(tdb, fn, private_data);
        }