compiler: use everywhere.

[ccan] / ccan / tdb / traverse.c

diff --git a/ccan/tdb/traverse.c b/ccan/tdb/traverse.c
index 8d808206f96b6fc3dcf1ee70a7d7f4687f5282a3..d329ef4da4030c095e530b0d7b05b344c2256305 100644 (file)
--- a/ccan/tdb/traverse.c
+++ b/ccan/tdb/traverse.c
@@ -32,7 +32,7 @@
 /* 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,
 /* 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);
 
 {
        int want_next = (tlock->off != 0);
 


@@ -145,7 +145,7 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
                                 struct tdb_traverse_lock *tl)
 {
        TDB_DATA key, dbuf;
                                 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;
 
        int ret = 0, count = 0;
        tdb_off_t off;
 


@@ -229,7 +229,7 @@ int tdb_traverse_read(struct tdb_context *tdb,
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_read--;
 
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_read--;
 

-       tdb_transaction_unlock(tdb);
+       tdb_transaction_unlock(tdb, F_RDLCK);

 
        return ret;
 }
 
        return ret;
 }


@@ -260,7 +260,7 @@ int tdb_traverse(struct tdb_context *tdb,
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_write--;
 
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_write--;
 

-       tdb_transaction_unlock(tdb);
+       tdb_transaction_unlock(tdb, F_WRLCK);

 
        return ret;
 }
 
        return ret;
 }


@@ -270,7 +270,7 @@ int tdb_traverse(struct tdb_context *tdb,
 TDB_DATA tdb_firstkey(struct tdb_context *tdb)
 {
        TDB_DATA key;
 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 */
        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;
 {
        uint32_t oldhash;
        TDB_DATA key = tdb_null;

-       struct list_struct rec;
+       struct tdb_record rec;

        unsigned char *k = NULL;
        tdb_off_t off;
 
        unsigned char *k = NULL;
        tdb_off_t off;