From b74c44b7e3689c2c4213357e897e13b594720f12 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 4 Sep 2023 17:35:29 +0200 Subject: [PATCH] unistr/u{8,16,32}-chr tests: Fix some gcc -Wshadow warnings. * tests/unistr/test-chr.h (main): Reduce of scope of local variables 'i' and 'page_boundary'. --- ChangeLog | 4 ++++ tests/unistr/test-chr.h | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ab50acc87..ec5ca2b68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2023-09-04 Bruno Haible + unistr/u{8,16,32}-chr tests: Fix some gcc -Wshadow warnings. + * tests/unistr/test-chr.h (main): Reduce of scope of local variables + 'i' and 'page_boundary'. + pipe-filter-gi, pipe-filter-ii tests: Fix some gcc -Wshadow warnings. * tests/test-pipe-filter-gi1.c (main): Rename local variable 'argv' to 'tr_argv'. diff --git a/tests/unistr/test-chr.h b/tests/unistr/test-chr.h index 47d6612d7e..7ee5dd2f84 100644 --- a/tests/unistr/test-chr.h +++ b/tests/unistr/test-chr.h @@ -20,7 +20,6 @@ int main (void) { size_t size = 0x100000; - size_t i; size_t length; UNIT *input; uint32_t *input32 = (uint32_t *) malloc (size * sizeof (uint32_t)); @@ -29,7 +28,7 @@ main (void) input32[0] = 'a'; input32[1] = 'b'; u32_set (input32 + 2, 'c', 1024); - for (i = 1026; i < size - 2; i += 63) + for (size_t i = 1026; i < size - 2; i += 63) { size_t last = i + 63 < size - 2 ? i + 63 : size - 2; ucs4_t uc = 'd' | (i - 1026); @@ -48,9 +47,11 @@ main (void) ASSERT (U_CHR (input, length, 'a') == input); ASSERT (U_CHR (input, 0, 'a') == NULL); - void *page_boundary = zerosize_ptr (); - if (page_boundary) - ASSERT (U_CHR (page_boundary, 0, 'a') == NULL); + { + void *page_boundary = zerosize_ptr (); + if (page_boundary != NULL) + ASSERT (U_CHR (page_boundary, 0, 'a') == NULL); + } ASSERT (U_CHR (input, length, 'b') == input + 1); ASSERT (U_CHR (input, length, 'c') == input + 2); @@ -59,7 +60,7 @@ main (void) { UNIT *exp = input + 1026; UNIT *prev = input + 1; - for (i = 1026; i < size - 2; i += 63) + for (size_t i = 1026; i < size - 2; i += 63) { UNIT c[6]; size_t n; -- 2.39.5