From a71bce7e62990550a57688e51b14eb82d6de196b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Tue, 2 Jan 2024 08:32:55 +0100 Subject: [PATCH] Fix build: use correct variable for category and env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream: this is a backport of a commit actually pushed upstream References: boo#1221700 Fixes: - error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocCategory *’ - error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocEnv *’ For: https://fedoraproject.org/wiki/Changes/PortingToModernC (https://fedoraproject.org/wiki/Toolchain/PortingToModernC) (https://gitlab.com/fweimer-rh/fedora-modernc-logs/-/blob/main/logs/l/libcomps.log) --- libcomps/tests/check_parse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libcomps/tests/check_parse.c b/libcomps/tests/check_parse.c index 9c2874b..f279708 100644 --- a/libcomps/tests/check_parse.c +++ b/libcomps/tests/check_parse.c @@ -585,8 +585,8 @@ START_TEST(test_arch) list = comps_doc_categories(doc2); ck_assert(list->len == 2); for (it = list->first, x=0; it != NULL; it = it->next, x++) { - g = (COMPS_DocCategory*)it->comps_obj; - str = (COMPS_Str*)comps_doccategory_get_id(g); + c = (COMPS_DocCategory*)it->comps_obj; + str = (COMPS_Str*)comps_doccategory_get_id(c); ck_assert_msg(strcmp(str->val, cats[0][x]) == 0, "%s != %s", str->val, cats[0][x]); COMPS_OBJECT_DESTROY(str); @@ -605,8 +605,8 @@ START_TEST(test_arch) list = comps_doc_environments(doc2); ck_assert(list->len == 2); for (it = list->first, x=0; it != NULL; it = it->next, x++) { - g = (COMPS_DocEnv*)it->comps_obj; - str = (COMPS_Str*)comps_docenv_get_id(g); + e = (COMPS_DocEnv*)it->comps_obj; + str = (COMPS_Str*)comps_docenv_get_id(e); ck_assert_msg(strcmp(str->val, envs[0][x]) == 0, "%s != %s", str->val, envs[0][x]); COMPS_OBJECT_DESTROY(str);