| Message ID | 20210503165525.26221-3-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tests: three easy Coverity fixes | expand |
On 03/05/2021 18.55, Peter Maydell wrote: > In rtc-test.c we know that s is non-NULL because qtest_start() > will return a non-NULL value, and we assume this when we > pass s to qtest_irq_intercept_in(). So we can drop the > initial assignment of NULL and the "if (s)" condition at > the end of the function. > > Fixes: Coverity CID 1432353 > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > tests/qtest/rtc-test.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c > index 402ce2c6090..8126ab1bdb8 100644 > --- a/tests/qtest/rtc-test.c > +++ b/tests/qtest/rtc-test.c > @@ -686,7 +686,7 @@ static void periodic_timer(void) > > int main(int argc, char **argv) > { > - QTestState *s = NULL; > + QTestState *s; > int ret; > > g_test_init(&argc, &argv, NULL); > @@ -712,9 +712,7 @@ int main(int argc, char **argv) > > ret = g_test_run(); > > - if (s) { > - qtest_quit(s); > - } > + qtest_quit(s); > > return ret; > } > Reviewed-by: Thomas Huth <thuth@redhat.com>
Peter Maydell <peter.maydell@linaro.org> writes: > In rtc-test.c we know that s is non-NULL because qtest_start() > will return a non-NULL value, and we assume this when we > pass s to qtest_irq_intercept_in(). So we can drop the > initial assignment of NULL and the "if (s)" condition at > the end of the function. > > Fixes: Coverity CID 1432353 > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> -- Alex Bennée
diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c index 402ce2c6090..8126ab1bdb8 100644 --- a/tests/qtest/rtc-test.c +++ b/tests/qtest/rtc-test.c @@ -686,7 +686,7 @@ static void periodic_timer(void) int main(int argc, char **argv) { - QTestState *s = NULL; + QTestState *s; int ret; g_test_init(&argc, &argv, NULL); @@ -712,9 +712,7 @@ int main(int argc, char **argv) ret = g_test_run(); - if (s) { - qtest_quit(s); - } + qtest_quit(s); return ret; }
In rtc-test.c we know that s is non-NULL because qtest_start() will return a non-NULL value, and we assume this when we pass s to qtest_irq_intercept_in(). So we can drop the initial assignment of NULL and the "if (s)" condition at the end of the function. Fixes: Coverity CID 1432353 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- tests/qtest/rtc-test.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.20.1