[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
unistr/u{8,16,32}-chr tests: Fix some gcc -Wshadow warnings
From: |
Bruno Haible |
Subject: |
unistr/u{8,16,32}-chr tests: Fix some gcc -Wshadow warnings |
Date: |
Mon, 04 Sep 2023 17:40:14 +0200 |
These warnings are easy to fix as well:
unistr/test-chr.h:96:9: warning: declaration of 'i' shadows a previous local
[-Wshadow=local]
unistr/test-chr.h:111:11: warning: declaration of 'page_boundary' shadows a
previous local [-Wshadow=local]
unistr/test-chr.h:123:22: warning: declaration of 'i' shadows a previous local
[-Wshadow=compatible-local]
2023-09-04 Bruno Haible <bruno@clisp.org>
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'.
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- unistr/u{8,16,32}-chr tests: Fix some gcc -Wshadow warnings,
Bruno Haible <=