diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:01:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:01:13 +0930 |
| commit | 662f46de21437527a57f0cfc77e290a3ec9f3d94 (patch) | |
| tree | 1c4a2f4978398bb40a3dc69d339f95d8b852559b /lib/tdb2/tdb.c | |
| parent | 658ff5b0f28e364d22ada4dbbc988ca0f82b911e (diff) | |
| download | samba-662f46de21437527a57f0cfc77e290a3ec9f3d94.tar.gz samba-662f46de21437527a57f0cfc77e290a3ec9f3d94.tar.bz2 samba-662f46de21437527a57f0cfc77e290a3ec9f3d94.zip | |
tdb2: unify tdb1_get_seqnum/tdb1_increment_seqnum into tdb_get_seqnum/tdb_inc_seqnum
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 57359c26e9626aa986ee0538efd13a44a466f39d)
Diffstat (limited to 'lib/tdb2/tdb.c')
| -rw-r--r-- | lib/tdb2/tdb.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c index 787ee7bd50..d4036d99be 100644 --- a/lib/tdb2/tdb.c +++ b/lib/tdb2/tdb.c @@ -565,7 +565,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 |