diff options
Diffstat (limited to 'test/sparse_array_test.c')
| -rw-r--r-- | test/sparse_array_test.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c index b50d79a4dbcd..b41b50902c19 100644 --- a/test/sparse_array_test.c +++ b/test/sparse_array_test.c @@ -36,14 +36,14 @@ static int test_sparse_array(void) { INT_MAX, "m" }, { 6666666, "d" }, { (ossl_uintmax_t)-1, "H" }, { 99, "e" } }; - SPARSE_ARRAY_OF(char) *sa; + SPARSE_ARRAY_OF(char) * sa; size_t i, j; int res = 0; if (!TEST_ptr(sa = ossl_sa_char_new()) - || !TEST_ptr_null(ossl_sa_char_get(sa, 3)) - || !TEST_ptr_null(ossl_sa_char_get(sa, 0)) - || !TEST_ptr_null(ossl_sa_char_get(sa, UINT_MAX))) + || !TEST_ptr_null(ossl_sa_char_get(sa, 3)) + || !TEST_ptr_null(ossl_sa_char_get(sa, 0)) + || !TEST_ptr_null(ossl_sa_char_get(sa, UINT_MAX))) goto err; for (i = 0; i < OSSL_NELEM(cases); i++) { @@ -81,12 +81,12 @@ static int test_sparse_array_num(void) int res = 0; if (!TEST_size_t_eq(ossl_sa_char_num(NULL), 0) - || !TEST_ptr(sa = ossl_sa_char_new()) - || !TEST_size_t_eq(ossl_sa_char_num(sa), 0)) + || !TEST_ptr(sa = ossl_sa_char_new()) + || !TEST_size_t_eq(ossl_sa_char_num(sa), 0)) goto err; for (i = 0; i < OSSL_NELEM(cases); i++) if (!TEST_true(ossl_sa_char_set(sa, cases[i].n, cases[i].v)) - || !TEST_size_t_eq(ossl_sa_char_num(sa), cases[i].num)) + || !TEST_size_t_eq(ossl_sa_char_num(sa), cases[i].num)) goto err; res = 1; err: @@ -101,7 +101,7 @@ struct index_cases_st { }; struct doall_st { - SPARSE_ARRAY_OF(char) *sa; + SPARSE_ARRAY_OF(char) * sa; size_t num_cases; const struct index_cases_st *cases; int res; @@ -143,9 +143,14 @@ static void leaf_delete(ossl_uintmax_t n, char *value, void *arg) static int test_sparse_array_doall(void) { static const struct index_cases_st cases[] = { - { 22, "A", 1 }, { 1021, "b", 0 }, { 3, "c", 0 }, { INT_MAX, "d", 1 }, - { (ossl_uintmax_t)-1, "H", 0 }, { (ossl_uintmax_t)-2, "i", 1 }, - { 666666666, "s", 1 }, { 1234567890, "t", 0 }, + { 22, "A", 1 }, + { 1021, "b", 0 }, + { 3, "c", 0 }, + { INT_MAX, "d", 1 }, + { (ossl_uintmax_t)-1, "H", 0 }, + { (ossl_uintmax_t)-2, "i", 1 }, + { 666666666, "s", 1 }, + { 1234567890, "t", 0 }, }; struct doall_st doall_data; size_t i; @@ -158,11 +163,11 @@ static int test_sparse_array_doall(void) doall_data.cases = cases; doall_data.all = 1; doall_data.sa = NULL; - for (i = 0; i < OSSL_NELEM(cases); i++) + for (i = 0; i < OSSL_NELEM(cases); i++) if (!TEST_true(ossl_sa_char_set(sa, cases[i].n, cases[i].v))) { TEST_note("failed at iteration %zu", i + 1); goto err; - } + } ossl_sa_char_doall_arg(sa, &leaf_check_all, &doall_data); if (doall_data.res == 0) { |