Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
huth committed Sep 25, 2023
1 parent 0daaf27 commit 926bef1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/qtest/m48t59-test.c
Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 926bef1

Please sign in to comment.