aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rw-r--r--t/unit-tests/u-oidtree.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/t/unit-tests/u-oidtree.c b/t/unit-tests/u-oidtree.c
index e6eede2740..d4d05c7dc3 100644
--- a/t/unit-tests/u-oidtree.c
+++ b/t/unit-tests/u-oidtree.c
@@ -24,7 +24,7 @@ static int fill_tree_loc(struct oidtree *ot, const char *hexes[], size_t n)
return 0;
}
-static void check_contains(struct oidtree *ot, const char *hex, int expected)
+static void check_contains(struct oidtree *ot, const char *hex, bool expected)
{
struct object_id oid;
@@ -38,7 +38,7 @@ struct expected_hex_iter {
const char *query;
};
-static enum cb_next check_each_cb(const struct object_id *oid, void *data)
+static int check_each_cb(const struct object_id *oid, void *data)
{
struct expected_hex_iter *hex_iter = data;
struct object_id expected;
@@ -49,7 +49,7 @@ static enum cb_next check_each_cb(const struct object_id *oid, void *data)
&expected);
cl_assert_equal_s(oid_to_hex(oid), oid_to_hex(&expected));
hex_iter->i += 1;
- return CB_CONTINUE;
+ return 0;
}
LAST_ARG_MUST_BE_NULL
@@ -88,12 +88,12 @@ void test_oidtree__cleanup(void)
void test_oidtree__contains(void)
{
FILL_TREE(&ot, "444", "1", "2", "3", "4", "5", "a", "b", "c", "d", "e");
- check_contains(&ot, "44", 0);
- check_contains(&ot, "441", 0);
- check_contains(&ot, "440", 0);
- check_contains(&ot, "444", 1);
- check_contains(&ot, "4440", 1);
- check_contains(&ot, "4444", 0);
+ check_contains(&ot, "44", false);
+ check_contains(&ot, "441", false);
+ check_contains(&ot, "440", false);
+ check_contains(&ot, "444", true);
+ check_contains(&ot, "4440", true);
+ check_contains(&ot, "4444", false);
}
void test_oidtree__each(void)