tdb2: split expand into functions and test separately.

[ccan] / ccan / tdb2 / check.c

diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c
index e39e50837d31c92de88de9efe85d574fdfc8af2e..f8abfc1fad4e30f20829e96cb6e557e0630efc45 100644 (file)
--- a/ccan/tdb2/check.c
+++ b/ccan/tdb2/check.c
@@ -71,8 +71,8 @@ static bool check_header(struct tdb_context *tdb)
            < tdb->map_size) {
                tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
                         "check: %llu zones size %llu don't cover %llu\n",
-                        (long long)(1ULL << tdb->header.v.zone_bits),
                         (long long)tdb->header.v.num_zones,
+                        (long long)(1ULL << tdb->header.v.zone_bits),
                         (long long)tdb->map_size);
                return false;
        }
@@ -86,8 +86,8 @@ static bool check_header(struct tdb_context *tdb)
 static int off_cmp(const tdb_off_t *a, const tdb_off_t *b)
 {
        /* Can overflow an int. */
-       return a > b ? 1
-               : a < b ? -1
+       return *a > *b ? 1
+               : *a < *b ? -1
                : 0;
 }