tests: Clean up global variables shadowing

[PATCH 08/10] tests/aio: Clean up global variable shadowing

Posted by Philippe Mathieu-Daudé 1 year, 1 month ago

Rename the argument to fix:

  tests/unit/test-aio.c:130:44: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  static void set_event_notifier(AioContext *ctx, EventNotifier *notifier,
                                             ^
  tests/unit/test-aio.c:22:20: note: previous declaration is here
  static AioContext *ctx;
                     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/unit/test-aio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
index 71ed31a4db..337b6e4ea7 100644
--- a/tests/unit/test-aio.c
+++ b/tests/unit/test-aio.c
@@ -127,10 +127,10 @@ static void *test_acquire_thread(void *opaque)
     return NULL;
 }
 
-static void set_event_notifier(AioContext *ctx, EventNotifier *notifier,
+static void set_event_notifier(AioContext *nctx, EventNotifier *notifier,
                                EventNotifierHandler *handler)
 {
-    aio_set_event_notifier(ctx, notifier, handler, NULL, NULL);
+    aio_set_event_notifier(nctx, notifier, handler, NULL, NULL);
 }
 
 static void dummy_notifier_read(EventNotifier *n)
-- 
2.41.0

Re: [PATCH 08/10] tests/aio: Clean up global variable shadowing

Posted by Thomas Huth 1 year, 1 month ago

On 09/10/2023 12.02, Philippe Mathieu-Daudé wrote:
> Rename the argument to fix:
> 
>    tests/unit/test-aio.c:130:44: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
>    static void set_event_notifier(AioContext *ctx, EventNotifier *notifier,
>                                               ^
>    tests/unit/test-aio.c:22:20: note: previous declaration is here
>    static AioContext *ctx;
>                       ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   tests/unit/test-aio.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
> index 71ed31a4db..337b6e4ea7 100644
> --- a/tests/unit/test-aio.c
> +++ b/tests/unit/test-aio.c
> @@ -127,10 +127,10 @@ static void *test_acquire_thread(void *opaque)
>       return NULL;
>   }
>   
> -static void set_event_notifier(AioContext *ctx, EventNotifier *notifier,
> +static void set_event_notifier(AioContext *nctx, EventNotifier *notifier,
>                                  EventNotifierHandler *handler)
>   {
> -    aio_set_event_notifier(ctx, notifier, handler, NULL, NULL);
> +    aio_set_event_notifier(nctx, notifier, handler, NULL, NULL);
>   }
>   
>   static void dummy_notifier_read(EventNotifier *n)

Reviewed-by: Thomas Huth <thuth@redhat.com>