tdb2: unify tdb1_get_seqnum/tdb1_increment_seqnum into tdb_get_seqnum/tdb_inc_seqnum

[ccan] / ccan / tdb2 / tdb.c

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index a3897831068dd99f5d0d67a12824d4a5cba6397b..c6bd8072ea9c4b18d55ee7b1ca5c4e64e550805d 100644 (file)
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -563,7 +563,20 @@ const char *tdb_name(const struct tdb_context *tdb)
 
 int64_t tdb_get_seqnum(struct tdb_context *tdb)
 {
-       tdb_off_t off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum));
+       tdb_off_t off;
+
+       if (tdb->flags & TDB_VERSION1) {
+               tdb1_off_t val;
+               tdb->last_error = TDB_SUCCESS;
+               val = tdb1_get_seqnum(tdb);
+
+               if (tdb->last_error != TDB_SUCCESS)
+                       return tdb->last_error;
+               else
+                       return val;
+       }
+
+       off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum));
        if (TDB_OFF_IS_ERR(off))
                tdb->last_error = off;
        else