diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:27 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:27 +0930 |
commit | 2237daed7e4c6c38241bc07383ed1a421abe8d6c (patch) | |
tree | 11495936fbf2306d4e443bdf529ed71ff8e9f23a /lib/tdb2/traverse.c | |
parent | 45467c0118da0c1d4e5644f4570f10aafe37a8a7 (diff) | |
download | samba-2237daed7e4c6c38241bc07383ed1a421abe8d6c.tar.gz samba-2237daed7e4c6c38241bc07383ed1a421abe8d6c.tar.bz2 samba-2237daed7e4c6c38241bc07383ed1a421abe8d6c.zip |
tdb2: add error conversion functions.
This clarifies the code a little, but also provides a more explicit
mechanism which can be used to debug error handling (by introducing
tdb_err_t and making it a pointer type).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit afa6d57b7d93fe4675a952f556eb462951baa257)
Diffstat (limited to 'lib/tdb2/traverse.c')
-rw-r--r-- | lib/tdb2/traverse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tdb2/traverse.c b/lib/tdb2/traverse.c index b1897ce1b8..50acce2b52 100644 --- a/lib/tdb2/traverse.c +++ b/lib/tdb2/traverse.c @@ -31,7 +31,7 @@ int64_t tdb_traverse_(struct tdb_context *tdb, if (tdb->flags & TDB_VERSION1) { count = tdb1_traverse(tdb, fn, p); if (count == -1) - return tdb->last_error; + return TDB_ERR_TO_OFF(tdb->last_error); return count; } @@ -51,7 +51,7 @@ int64_t tdb_traverse_(struct tdb_context *tdb, } if (ecode != TDB_ERR_NOEXIST) { - return tdb->last_error = ecode; + return TDB_ERR_TO_OFF(tdb->last_error = ecode); } tdb->last_error = TDB_SUCCESS; return count; @@ -96,7 +96,7 @@ 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 tdb->last_error = tinfo.prev; + return tdb->last_error = TDB_OFF_TO_ERR(tinfo.prev); } tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK); @@ -128,7 +128,7 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb) /* FIXME: Be smarter. */ count = tdb_traverse(tdb, wipe_one, &ecode); if (count < 0) - ecode = count; + ecode = TDB_OFF_TO_ERR(count); tdb_allrecord_unlock(tdb, F_WRLCK); return tdb->last_error = ecode; } |