[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/10] tests/coroutine: Clean up global variable shadowing
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH 10/10] tests/coroutine: Clean up global variable shadowing |
|
Date: |
Mon, 9 Oct 2023 12:02:51 +0200 |
Rename the global variable to avoid:
tests/unit/test-coroutine.c:430:11: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
bool *done = opaque;
^
tests/unit/test-coroutine.c:438:10: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
bool done = false;
^
tests/unit/test-coroutine.c:198:12: note: previous declaration is here
static int done;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/unit/test-coroutine.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c
index b0d21d673a..29695cbdcb 100644
--- a/tests/unit/test-coroutine.c
+++ b/tests/unit/test-coroutine.c
@@ -195,7 +195,7 @@ static void test_no_dangling_access(void)
}
static bool locked;
-static int done;
+static int done_count;
static void coroutine_fn mutex_fn(void *opaque)
{
@@ -206,7 +206,7 @@ static void coroutine_fn mutex_fn(void *opaque)
qemu_coroutine_yield();
locked = false;
qemu_co_mutex_unlock(m);
- done++;
+ done_count++;
}
static void coroutine_fn lockable_fn(void *opaque)
@@ -218,7 +218,7 @@ static void coroutine_fn lockable_fn(void *opaque)
qemu_coroutine_yield();
locked = false;
qemu_lockable_unlock(x);
- done++;
+ done_count++;
}
static void do_test_co_mutex(CoroutineEntry *entry, void *opaque)
@@ -226,7 +226,7 @@ static void do_test_co_mutex(CoroutineEntry *entry, void
*opaque)
Coroutine *c1 = qemu_coroutine_create(entry, opaque);
Coroutine *c2 = qemu_coroutine_create(entry, opaque);
- done = 0;
+ done_count = 0;
qemu_coroutine_enter(c1);
g_assert(locked);
qemu_coroutine_enter(c2);
@@ -235,11 +235,11 @@ static void do_test_co_mutex(CoroutineEntry *entry, void
*opaque)
* terminates.
*/
qemu_coroutine_enter(c1);
- g_assert_cmpint(done, ==, 1);
+ g_assert_cmpint(done_count, ==, 1);
g_assert(locked);
qemu_coroutine_enter(c2);
- g_assert_cmpint(done, ==, 2);
+ g_assert_cmpint(done_count, ==, 2);
g_assert(!locked);
}
--
2.41.0
- [PATCH 06/10] tests/rtl8139: Clean up global variable shadowing, (continued)
- [PATCH 06/10] tests/rtl8139: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 07/10] tests/npcm7xx_adc: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 02/10] tests/throttle: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 09/10] tests/aio-multithread: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 08/10] tests/aio: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 10/10] tests/coroutine: Clean up global variable shadowing,
Philippe Mathieu-Daudé <=
- Re: [PATCH 00/10] tests: Clean up global variables shadowing, Thomas Huth, 2023/10/27