mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-03 19:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/qtest/m48t59-test: Silence compiler warning with -Wshadow

Browse Source 
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>
This commit is contained in:
Thomas Huth
2023-09-22 18:37:42 +02:00
parent 0daaf2761f
commit 926bef1d82
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/qtest/m48t59-test.c
View File

@@ -155,7 +155,7 @@ static void bcd_check_time(void)
struct tm *datep; struct tm *datep;
time_t ts; time_t ts;
const int wiggle = 2; 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 * 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); ts = time(NULL);
gmtime_r(&ts, &start); gmtime_r(&ts, &start);
cmos_get_date_time(s, &date[0]); cmos_get_date_time(qts, &date[0]);
cmos_get_date_time(s, &date[1]); cmos_get_date_time(qts, &date[1]);
cmos_get_date_time(s, &date[2]); cmos_get_date_time(qts, &date[2]);
cmos_get_date_time(s, &date[3]); cmos_get_date_time(qts, &date[3]);
ts = time(NULL); ts = time(NULL);
gmtime_r(&ts, &end); gmtime_r(&ts, &end);
@@ -207,7 +207,7 @@ static void bcd_check_time(void)
g_assert_cmpint(ABS(t - s), <=, wiggle); g_assert_cmpint(ABS(t - s), <=, wiggle);
} }
qtest_quit(s); qtest_quit(qts);
} }
/* success if no crash or abort */ /* success if no crash or abort */