tdb2: unify tdb1_traverse into tdb_traverse

[ccan] / ccan / tdb2 / traverse.c

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 71a889e5de472a76cae1f1e7769e343f53d36ea7..d93c05abbd76996f66b5a376431648fd30645e3e 100644 (file)
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -28,6 +28,13 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
        struct tdb_data k, d;
        int64_t count = 0;
 
+       if (tdb->flags & TDB_VERSION1) {
+               count = tdb1_traverse(tdb, fn, p);
+               if (count == -1)
+                       return tdb->last_error;
+               return count;
+       }
+
        k.dptr = NULL;
        for (ecode = first_in_hash(tdb, &tinfo, &k, &d.dsize);
             ecode == TDB_SUCCESS;
@@ -37,14 +44,16 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
                count++;
                if (fn && fn(tdb, k, d, p)) {
                        free(k.dptr);
+                       tdb->last_error = TDB_SUCCESS;
                        return count;
                }
                free(k.dptr);
        }
 
        if (ecode != TDB_ERR_NOEXIST) {
-               return ecode;
+               return tdb->last_error = ecode;
        }
+       tdb->last_error = TDB_SUCCESS;
        return count;
 }
        
@@ -52,7 +61,7 @@ enum TDB_ERROR tdb_firstkey(struct tdb_context *tdb, struct tdb_data *key)
 {
        struct traverse_info tinfo;
 
-       return first_in_hash(tdb, &tinfo, key, NULL);
+       return tdb->last_error = first_in_hash(tdb, &tinfo, key, NULL);
 }
 
 /* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
@@ -65,11 +74,11 @@ enum TDB_ERROR tdb_nextkey(struct tdb_context *tdb, struct tdb_data *key)
        tinfo.prev = find_and_lock(tdb, *key, F_RDLCK, &h, &rec, &tinfo);
        free(key->dptr);
        if (TDB_OFF_IS_ERR(tinfo.prev)) {
-               return tinfo.prev;
+               return tdb->last_error = tinfo.prev;
        }
        tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 
-       return next_in_hash(tdb, &tinfo, key, NULL);
+       return tdb->last_error = next_in_hash(tdb, &tinfo, key, NULL);
 }
 
 static int wipe_one(struct tdb_context *tdb,
@@ -86,12 +95,12 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb)
 
        ecode = tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false);
        if (ecode != TDB_SUCCESS)
-               return ecode;
+               return tdb->last_error = ecode;
 
        /* FIXME: Be smarter. */
        count = tdb_traverse(tdb, wipe_one, &ecode);
        if (count < 0)
                ecode = count;
        tdb_allrecord_unlock(tdb, F_WRLCK);
-       return ecode;
+       return tdb->last_error = ecode;
 }