tdb2: rework some io.c functions to encode errors in their pointer returns.

[ccan] / ccan / tdb2 / free.c

diff --git a/ccan/tdb2/free.c b/ccan/tdb2/free.c
index fb45c80c7aecc65e6156180c3dc61e4db2750d17..4f9a52a1873d4e64a5f399b12dddb825b0bc3a95 100644 (file)
--- a/ccan/tdb2/free.c
+++ b/ccan/tdb2/free.c
@@ -297,8 +297,10 @@ static int coalesce(struct tdb_context *tdb,
                unsigned ftable, bucket;
 
                r = tdb_access_read(tdb, end, sizeof(*r), true);
                unsigned ftable, bucket;
 
                r = tdb_access_read(tdb, end, sizeof(*r), true);

-               if (!r)
+               if (TDB_PTR_IS_ERR(r)) {
+                       tdb->ecode = TDB_PTR_ERR(r);

                        goto err;
                        goto err;

+               }

 
                if (frec_magic(r) != TDB_FREE_MAGIC
                    || frec_ftable(r) == TDB_FTABLE_NONE) {
 
                if (frec_magic(r) != TDB_FREE_MAGIC
                    || frec_ftable(r) == TDB_FTABLE_NONE) {


@@ -443,8 +445,10 @@ again:
                tdb_off_t next;
 
                r = tdb_access_read(tdb, off, sizeof(*r), true);
                tdb_off_t next;
 
                r = tdb_access_read(tdb, off, sizeof(*r), true);

-               if (!r)
+               if (TDB_PTR_IS_ERR(r)) {
+                       tdb->ecode = TDB_PTR_ERR(r);

                        goto unlock_err;
                        goto unlock_err;

+               }

 
                if (frec_magic(r) != TDB_FREE_MAGIC) {
                        tdb_access_release(tdb, r);
 
                if (frec_magic(r) != TDB_FREE_MAGIC) {
                        tdb_access_release(tdb, r);