From 26a7ff24df8cb52c08bab23cff7a8f5ceb3c4465 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 15 May 2021 18:49:36 +0100 Subject: Tests: Squash comparison of signed vs unsigned warnings. --- test/tokeniser2.c | 8 ++++---- test/tokeniser3.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/tokeniser2.c b/test/tokeniser2.c index 79d84ca..f38f7ab 100644 --- a/test/tokeniser2.c +++ b/test/tokeniser2.c @@ -57,7 +57,7 @@ int main(int argc, char **argv) tests = json_object_get_array((struct json_object *) (json_object_get_object(json)->head)->v); - for (i = 0; i < array_list_length(tests); i++) { + for (i = 0; i < (int)array_list_length(tests); i++) { /* Get test */ struct json_object *test = (struct json_object *) array_list_get_idx(tests, i); @@ -216,7 +216,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) struct json_object *obj = NULL; struct array_list *items; - for (; ctx->output_index < array_list_length(ctx->output); + for (; ctx->output_index < (int)array_list_length(ctx->output); ctx->output_index++) { /* Get object for index */ obj = (struct json_object *) @@ -236,11 +236,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) * produced more tokens than expected. We allow for the generation * of a terminating EOF token, however. */ assert("too many tokens" && - (ctx->output_index < array_list_length(ctx->output) || + (ctx->output_index < (int)array_list_length(ctx->output) || token->type == HUBBUB_TOKEN_EOF)); /* Got a terminating EOF -- no error */ - if (ctx->output_index >= array_list_length(ctx->output)) + if (ctx->output_index >= (int)array_list_length(ctx->output)) return HUBBUB_OK; /* Now increment the output index so we don't re-expect this token */ diff --git a/test/tokeniser3.c b/test/tokeniser3.c index 22bda5c..416ff5d 100644 --- a/test/tokeniser3.c +++ b/test/tokeniser3.c @@ -55,7 +55,7 @@ int main(int argc, char **argv) tests = json_object_get_array((struct json_object *) (json_object_get_object(json)->head)->v); - for (i = 0; i < array_list_length(tests); i++) { + for (i = 0; i < (int)array_list_length(tests); i++) { /* Get test */ struct json_object *test = (struct json_object *) array_list_get_idx(tests, i); @@ -221,7 +221,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) struct json_object *obj = NULL; struct array_list *items; - for (; ctx->output_index < array_list_length(ctx->output); + for (; ctx->output_index < (int)array_list_length(ctx->output); ctx->output_index++) { /* Get object for index */ obj = (struct json_object *) @@ -241,11 +241,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) * produced more tokens than expected. We allow for the generation * of a terminating EOF token, however. */ assert("too many tokens" && - (ctx->output_index < array_list_length(ctx->output) || + (ctx->output_index < (int)array_list_length(ctx->output) || token->type == HUBBUB_TOKEN_EOF)); /* Got a terminating EOF -- no error */ - if (ctx->output_index >= array_list_length(ctx->output)) + if (ctx->output_index >= (int)array_list_length(ctx->output)) return HUBBUB_OK; /* Now increment the output index so we don't re-expect this token */ -- cgit v1.2.3