[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] tests/hd-geo-test: Clean up global variable shadowing
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/10] tests/hd-geo-test: Clean up global variable shadowing |
Date: |
Mon, 9 Oct 2023 12:02:46 +0200 |
Rename the variable to fix:
tests/qtest/hd-geo-test.c:610:11: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
char *img_file_name;
^
tests/qtest/hd-geo-test.c:80:14: note: previous declaration is here
static char *img_file_name[backend_last];
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/qtest/hd-geo-test.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index d08bffad91..e5e28c412d 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -78,6 +78,7 @@ static const CHST hd_chst[backend_last][mbr_last] = {
};
static char *img_file_name[backend_last];
+static char *qcow2_imgpath;
static const CHST *cur_ide[4];
@@ -607,18 +608,17 @@ static TestArgs *create_args(void)
static void add_drive_with_mbr(TestArgs *args,
MBRpartitions mbr, uint64_t sectors)
{
- char *img_file_name;
char part[300];
int ret;
g_assert(args->n_drives < MAX_DRIVES);
- img_file_name = create_qcow2_with_mbr(mbr, sectors);
+ qcow2_imgpath = create_qcow2_with_mbr(mbr, sectors);
- args->drives[args->n_drives] = img_file_name;
+ args->drives[args->n_drives] = qcow2_imgpath;
ret = snprintf(part, sizeof(part),
"-drive file=%s,if=none,format=qcow2,id=disk%d",
- img_file_name, args->n_drives);
+ qcow2_imgpath, args->n_drives);
g_assert((0 < ret) && (ret <= sizeof(part)));
args->argc = append_arg(args->argc, args->argv, ARGV_SIZE, g_strdup(part));
args->n_drives++;
@@ -1139,6 +1139,10 @@ test_add_done:
g_free(img_file_name[i]);
}
}
+ if (qcow2_imgpath) {
+ unlink(qcow2_imgpath);
+ g_free(qcow2_imgpath);
+ }
return ret;
}
--
2.41.0
- Re: [PATCH 02/10] tests/throttle: Clean up global variable shadowing, (continued)
- [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é, 2023/10/09
- [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é <=
- [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
- [PATCH 09/10] tests/aio-multithread: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- Re: [PATCH 00/10] tests: Clean up global variables shadowing, Thomas Huth, 2023/10/27