[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in pr
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in prepare_image() |
Date: |
Mon, 9 Oct 2023 12:02:45 +0200 |
Rename the variable to fix:
tests/qtest/cdrom-test.c:40:50: error: declaration shadows a variable in the
global scope [-Werror,-Wshadow]
static int prepare_image(const char *arch, char *isoimage)
^
tests/qtest/cdrom-test.c:18:13: note: previous declaration is here
static char isoimage[] = "cdrom-boot-iso-XXXXXX";
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/qtest/cdrom-test.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index f2a8d91929..0945383789 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -37,17 +37,17 @@ static int exec_xorrisofs(const char **args)
return exit_status;
}
-static int prepare_image(const char *arch, char *isoimage)
+static int prepare_image(const char *arch, char *isoimagepath)
{
char srcdir[] = "cdrom-test-dir-XXXXXX";
char *codefile = NULL;
int ifh, ret = -1;
const char *args[] = {
"xorrisofs", "-quiet", "-l", "-no-emul-boot",
- "-b", NULL, "-o", isoimage, srcdir, NULL
+ "-b", NULL, "-o", isoimagepath, srcdir, NULL
};
- ifh = mkstemp(isoimage);
+ ifh = mkstemp(isoimagepath);
if (ifh < 0) {
perror("Error creating temporary iso image file");
return -1;
--
2.41.0
- [PATCH 00/10] tests: Clean up global variables shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 01/10] system/qtest: Clean up global variable shadowing in qtest_server_init(), Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 02/10] tests/throttle: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 03/10] tests/virtio-scsi: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in prepare_image(),
Philippe Mathieu-Daudé <=
- [PATCH 07/10] tests/npcm7xx_adc: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 06/10] tests/rtl8139: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 05/10] tests/hd-geo-test: 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é, 2023/10/09