X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=c6bd8072ea9c4b18d55ee7b1ca5c4e64e550805d;hb=57359c26e9626aa986ee0538efd13a44a466f39d;hp=5e92af8c9666ac4c443af53638fb1c822229179c;hpb=2bba2a856a6cfdb93085b701557850bc1da99587;p=ccan diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c index 5e92af8c..c6bd8072 100644 --- a/ccan/tdb2/tdb.c +++ b/ccan/tdb2/tdb.c @@ -526,6 +526,11 @@ enum TDB_ERROR tdb_parse_record_(struct tdb_context *tdb, struct hash_info h; enum TDB_ERROR ecode; + if (tdb->flags & TDB_VERSION1) { + return tdb->last_error = tdb1_parse_record(tdb, key, parse, + data); + } + off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = off; @@ -558,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