aboutsummaryrefslogtreecommitdiff
path: root/tests/qtest
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2023-09-22 18:37:42 +0200
committerThomas Huth <thuth@redhat.com>2023-09-25 07:54:35 +0200
commit926bef1d82bb9eb7a752aa128d9e70b808906243 (patch)
tree47313cdd38b55e4263f03fd5279ac2ba7a28daca /tests/qtest
parent0daaf2761f6d268ffaa2d01d450e202e127452b1 (diff)
downloadqemu-926bef1d82bb9eb7a752aa128d9e70b808906243.zip
qemu-926bef1d82bb9eb7a752aa128d9e70b808906243.tar.gz
qemu-926bef1d82bb9eb7a752aa128d9e70b808906243.tar.bz2
tests/qtest/m48t59-test: Silence compiler warning with -Wshadow
When compiling this file with -Wshadow=local , we get: ../tests/qtest/m48t59-test.c: In function ‘bcd_check_time’: ../tests/qtest/m48t59-test.c:195:17: warning: declaration of ‘s’ shadows a previous local [-Wshadow=local] 195 | long t, s; | ^ ../tests/qtest/m48t59-test.c:158:17: note: shadowed declaration is here 158 | QTestState *s = m48t59_qtest_start(); | ^ Rename the QTestState variable to "qts" which is the common naming for such a variable in other tests. Reported-by: Markus Armbruster <armbru@redhat.com> Message-ID: <20230922163742.149444-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/qtest')
-rw-r--r--tests/qtest/m48t59-test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c
index 843d2ce..9487faf 100644
--- a/tests/qtest/m48t59-test.c
+++ b/tests/qtest/m48t59-test.c
@@ -155,7 +155,7 @@ static void bcd_check_time(void)
struct tm *datep;
time_t ts;
const int wiggle = 2;
- QTestState *s = m48t59_qtest_start();
+ QTestState *qts = m48t59_qtest_start();
/*
* This check assumes a few things. First, we cannot guarantee that we get
@@ -173,10 +173,10 @@ static void bcd_check_time(void)
ts = time(NULL);
gmtime_r(&ts, &start);
- cmos_get_date_time(s, &date[0]);
- cmos_get_date_time(s, &date[1]);
- cmos_get_date_time(s, &date[2]);
- cmos_get_date_time(s, &date[3]);
+ cmos_get_date_time(qts, &date[0]);
+ cmos_get_date_time(qts, &date[1]);
+ cmos_get_date_time(qts, &date[2]);
+ cmos_get_date_time(qts, &date[3]);
ts = time(NULL);
gmtime_r(&ts, &end);
@@ -207,7 +207,7 @@ static void bcd_check_time(void)
g_assert_cmpint(ABS(t - s), <=, wiggle);
}
- qtest_quit(s);
+ qtest_quit(qts);
}
/* success if no crash or abort */