[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/11] tests/cdrom-test: Clean up global variable shadowing in pre
From: |
Thomas Huth |
Subject: |
[PULL 04/11] tests/cdrom-test: Clean up global variable shadowing in prepare_image() |
Date: |
Fri, 27 Oct 2023 11:37:03 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-ID: <20231009100251.56019-5-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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
- [PULL 00/11] testing patches (+ 1 deprecation patch), Thomas Huth, 2023/10/27
- [PULL 03/11] tests/virtio-scsi: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 02/11] tests/throttle: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 04/11] tests/cdrom-test: Clean up global variable shadowing in prepare_image(),
Thomas Huth <=
- [PULL 05/11] tests/rtl8139: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 01/11] system/qtest: Clean up global variable shadowing in qtest_server_init(), Thomas Huth, 2023/10/27
- [PULL 07/11] tests/aio: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 06/11] tests/npcm7xx_adc: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 08/11] tests/coroutine: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 09/11] docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated, Thomas Huth, 2023/10/27
- [PULL 10/11] tests/vm/freebsd: Add additional library paths for libfdt, Thomas Huth, 2023/10/27
- [PULL 11/11] ipmi-bt-test: force ipv4, Thomas Huth, 2023/10/27
- Re: [PULL 00/11] testing patches (+ 1 deprecation patch), Stefan Hajnoczi, 2023/10/30