compiler: use everywhere.

[ccan] / ccan / tdb / traverse.c

diff --git a/ccan/tdb/traverse.c b/ccan/tdb/traverse.c
index d8b15aff4aa39f22f76fd6080e8e251404be4d75..d329ef4da4030c095e530b0d7b05b344c2256305 100644 (file)
--- a/ccan/tdb/traverse.c
+++ b/ccan/tdb/traverse.c
@@ -27,9 +27,12 @@
 
 #include "tdb_private.h"
 
 
 #include "tdb_private.h"
 

-/* Uses traverse lock: 0 = finish, -1 = error, other = record offset */
-static int tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock *tlock,
-                        struct list_struct *rec)
+#define TDB_NEXT_LOCK_ERR ((tdb_off_t)-1)
+
+/* 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 tdb_record *rec)

 {
        int want_next = (tlock->off != 0);
 
 {
        int want_next = (tlock->off != 0);
 


@@ -71,7 +74,7 @@ static int tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock *tloc
                }
 
                if (tdb_lock(tdb, tlock->hash, tlock->lock_rw) == -1)
                }
 
                if (tdb_lock(tdb, tlock->hash, tlock->lock_rw) == -1)

-                       return -1;
+                       return TDB_NEXT_LOCK_ERR;

 
                /* No previous record?  Start at top of chain. */
                if (!tlock->off) {
 
                /* No previous record?  Start at top of chain. */
                if (!tlock->off) {


@@ -99,6 +102,7 @@ static int tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock *tloc
 
                        /* Detect infinite loops. From "Shlomi Yaakobovich" <Shlomi@exanet.com>. */
                        if (tlock->off == rec->next) {
 
                        /* Detect infinite loops. From "Shlomi Yaakobovich" <Shlomi@exanet.com>. */
                        if (tlock->off == rec->next) {

+                               tdb->ecode = TDB_ERR_CORRUPT;

                                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_next_lock: loop detected.\n"));
                                goto fail;
                        }
                                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_next_lock: loop detected.\n"));
                                goto fail;
                        }


@@ -121,13 +125,14 @@ static int tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock *tloc
                want_next = 0;
        }
        /* We finished iteration without finding anything */
                want_next = 0;
        }
        /* We finished iteration without finding anything */

-       return TDB_ERRCODE(TDB_SUCCESS, 0);
+       tdb->ecode = TDB_SUCCESS;
+       return 0;

 
  fail:
        tlock->off = 0;
        if (tdb_unlock(tdb, tlock->hash, tlock->lock_rw) != 0)
                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_next_lock: On error unlock failed!\n"));
 
  fail:
        tlock->off = 0;
        if (tdb_unlock(tdb, tlock->hash, tlock->lock_rw) != 0)
                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_next_lock: On error unlock failed!\n"));

-       return -1;
+       return TDB_NEXT_LOCK_ERR;

 }
 
 /* traverse the entire database - calling fn(tdb, key, data) on each element.
 }
 
 /* traverse the entire database - calling fn(tdb, key, data) on each element.


@@ -140,8 +145,9 @@ 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;
-       int ret, count = 0;
+       struct tdb_record rec;
+       int ret = 0, count = 0;
+       tdb_off_t off;

 
        /* This was in the initializaton, above, but the IRIX compiler
         * did not like it.  crh
 
        /* This was in the initializaton, above, but the IRIX compiler
         * did not like it.  crh


@@ -152,7 +158,11 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
        tdb->travlocks.next = tl;
 
        /* tdb_next_lock places locks on the record returned, and its chain */
        tdb->travlocks.next = tl;
 
        /* tdb_next_lock places locks on the record returned, and its chain */

-       while ((ret = tdb_next_lock(tdb, tl, &rec)) > 0) {
+       while ((off = tdb_next_lock(tdb, tl, &rec)) != 0) {
+               if (off == TDB_NEXT_LOCK_ERR) {
+                       ret = -1;
+                       goto out;
+               }

                count++;
                /* now read the full record */
                key.dptr = tdb_alloc_read(tdb, tl->off + sizeof(rec), 
                count++;
                /* now read the full record */
                key.dptr = tdb_alloc_read(tdb, tl->off + sizeof(rec), 


@@ -180,7 +190,6 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
                if (fn && fn(tdb, key, dbuf, private_data)) {
                        /* They want us to terminate traversal */
                        tdb_trace_ret(tdb, "tdb_traverse_end", count);
                if (fn && fn(tdb, key, dbuf, private_data)) {
                        /* They want us to terminate traversal */
                        tdb_trace_ret(tdb, "tdb_traverse_end", count);

-                       ret = count;

                        if (tdb_unlock_record(tdb, tl->off) != 0) {
                                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_traverse: unlock_record failed!\n"));;
                                ret = -1;
                        if (tdb_unlock_record(tdb, tl->off) != 0) {
                                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_traverse: unlock_record failed!\n"));;
                                ret = -1;


@@ -220,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;
 }


@@ -251,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;
 }


@@ -261,7 +270,8 @@ 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 */
        if (tdb_unlock_record(tdb, tdb->travlocks.off) != 0)
 
        /* release any old lock */
        if (tdb_unlock_record(tdb, tdb->travlocks.off) != 0)


@@ -270,7 +280,8 @@ TDB_DATA tdb_firstkey(struct tdb_context *tdb)
        tdb->travlocks.lock_rw = F_RDLCK;
 
        /* Grab first record: locks chain and returned record. */
        tdb->travlocks.lock_rw = F_RDLCK;
 
        /* Grab first record: locks chain and returned record. */

-       if (tdb_next_lock(tdb, &tdb->travlocks, &rec) <= 0) {
+       off = tdb_next_lock(tdb, &tdb->travlocks, &rec);
+       if (off == 0 || off == TDB_NEXT_LOCK_ERR) {

                tdb_trace_retrec(tdb, "tdb_firstkey", tdb_null);
                return tdb_null;
        }
                tdb_trace_retrec(tdb, "tdb_firstkey", tdb_null);
                return tdb_null;
        }


@@ -291,8 +302,9 @@ 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;
        unsigned char *k = NULL;

+       tdb_off_t off;

 
        /* Is locked key the old key?  If so, traverse will be reliable. */
        if (tdb->travlocks.off) {
 
        /* Is locked key the old key?  If so, traverse will be reliable. */
        if (tdb->travlocks.off) {


@@ -336,7 +348,8 @@ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
 
        /* Grab next record: locks chain and returned record,
           unlocks old record */
 
        /* Grab next record: locks chain and returned record,
           unlocks old record */

-       if (tdb_next_lock(tdb, &tdb->travlocks, &rec) > 0) {
+       off = tdb_next_lock(tdb, &tdb->travlocks, &rec);
+       if (off != TDB_NEXT_LOCK_ERR && off != 0) {

                key.dsize = rec.key_len;
                key.dptr = tdb_alloc_read(tdb, tdb->travlocks.off+sizeof(rec),
                                          key.dsize);
                key.dsize = rec.key_len;
                key.dptr = tdb_alloc_read(tdb, tdb->travlocks.off+sizeof(rec),
                                          key.dsize);