On 2020-07-02 01:48, Paul Eggert wrote:
> diff --git a/tests/test-memchr.c b/tests/test-memchr.c
> - ASSERT (MEMCHR (zerosize_ptr (), 'a', 0) == NULL);
> + void *page_boundary = zerosize_ptr ();
> + if (page_boundary)
> + ASSERT (MEMCHR (page_boundary, 'a', 0) == NULL);
This triggers a new shadowing warning (here with -Werror, gcc 10.1.1):
test-memchr.c: In function 'main':
test-memchr.c:98:11: error: declaration of 'page_boundary' shadows a previous
local [-Werror=shadow]
98 | char *page_boundary = (char *) zerosize_ptr ();
| ^~~~~~~~~~~~~
test-memchr.c:52:9: note: shadowed declaration is here
52 | void *page_boundary = zerosize_ptr ();
| ^~~~~~~~~~~~~
cc1: all warnings being treated as errors
The attached fixes it.
Okay to push?
Have a nice day,
Berny
>From c24438ea3d142267f9e5e14440ffe4fa6052f075 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <[email protected]>
Date: Thu, 2 Jul 2020 23:11:52 +0200
Subject: [PATCH] tests: avoid shadowing warning
* tests/test-memchr.c (main): Give page_boundary variable a tight scope.
---
ChangeLog | 5 +++++
tests/test-memchr.c | 9 ++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6115ab946..047a3bbd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-02 Bernhard Voelker <[email protected]>
+
+ tests: avoid shadowing warning
+ * tests/test-memchr.c (main): Give page_boundary variable a tight scope.
+
2020-07-01 Paul Eggert <[email protected]>
manywarnings: improve port to GCC 10.1
diff --git a/tests/test-memchr.c b/tests/test-memchr.c
index d81bf3baf..5ea4c03b0 100644
--- a/tests/test-memchr.c
+++ b/tests/test-memchr.c
@@ -49,9 +49,12 @@ main (void)
ASSERT (MEMCHR (input, 'a', n) == input);
ASSERT (MEMCHR (input, 'a', 0) == NULL);
- void *page_boundary = zerosize_ptr ();
- if (page_boundary)
- ASSERT (MEMCHR (page_boundary, 'a', 0) == NULL);
+
+ {
+ void *page_boundary = zerosize_ptr ();
+ if (page_boundary)
+ ASSERT (MEMCHR (page_boundary, 'a', 0) == NULL);
+ }
ASSERT (MEMCHR (input, 'b', n) == input + 1);
ASSERT (MEMCHR (input, 'c', n) == input + 2);
--
2.27.0
