From cc5a3ab5d3377229730628c37a0631da538650c2 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Wed, 4 Oct 2017 15:23:21 +0200 Subject: [PATCH] Safely squelch a bunch of warnings --- tests/check_cfg.c | 6 +++--- tests/check_cfg_xmlfile.c | 6 +++--- tests/check_cmdline.c | 6 +++--- tests/check_log.c | 6 +++--- tests/check_mdata.c | 8 ++++---- tests/check_playlist.c | 6 +++--- tests/check_stream.c | 6 +++--- tests/check_util.c | 6 +++--- tests/check_xalloc.c | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/check_cfg.c b/tests/check_cfg.c index 0915aad..4f42661 100644 --- a/tests/check_cfg.c +++ b/tests/check_cfg.c @@ -930,9 +930,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = cfg_suite(); sr = srunner_create(s); diff --git a/tests/check_cfg_xmlfile.c b/tests/check_cfg_xmlfile.c index a410f6a..0f181c6 100644 --- a/tests/check_cfg_xmlfile.c +++ b/tests/check_cfg_xmlfile.c @@ -78,9 +78,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = cfg_xmlfile_suite(); sr = srunner_create(s); diff --git a/tests/check_cmdline.c b/tests/check_cmdline.c index 26590c9..985320e 100644 --- a/tests/check_cmdline.c +++ b/tests/check_cmdline.c @@ -177,9 +177,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = cmdline_suite(); sr = srunner_create(s); diff --git a/tests/check_log.c b/tests/check_log.c index 83a9cc0..bbe0257 100644 --- a/tests/check_log.c +++ b/tests/check_log.c @@ -78,9 +78,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = log_suite(); sr = srunner_create(s); diff --git a/tests/check_mdata.c b/tests/check_mdata.c index f639081..f1b0d32 100644 --- a/tests/check_mdata.c +++ b/tests/check_mdata.c @@ -150,7 +150,7 @@ START_TEST(test_mdata_strformat) ck_assert_int_lt(mdata_strformat(md, buf, sizeof(buf), NULL), 0); ret = mdata_strformat(md, buf, sizeof(buf), "@a@/@b@/@t@/@T@/@s@"); - ck_assert_int_eq(ret, strlen(buf)); + ck_assert_int_eq(ret, (int)strlen(buf)); ck_assert_str_eq(buf, "test artist/test album/test title" "/" SRCDIR "/test01-artist+album+title.ogg" @@ -199,9 +199,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = mdata_suite(); sr = srunner_create(s); diff --git a/tests/check_playlist.c b/tests/check_playlist.c index 6239bb6..7477cf0 100644 --- a/tests/check_playlist.c +++ b/tests/check_playlist.c @@ -137,9 +137,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = playlist_suite(); sr = srunner_create(s); diff --git a/tests/check_stream.c b/tests/check_stream.c index 6e74eec..b2e2f28 100644 --- a/tests/check_stream.c +++ b/tests/check_stream.c @@ -128,9 +128,9 @@ teardown_checked(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = stream_suite(); sr = srunner_create(s); diff --git a/tests/check_util.c b/tests/check_util.c index aa768a5..b25bfd6 100644 --- a/tests/check_util.c +++ b/tests/check_util.c @@ -129,9 +129,9 @@ util_suite(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = util_suite(); sr = srunner_create(s); diff --git a/tests/check_xalloc.c b/tests/check_xalloc.c index 9c5a484..7561ccb 100644 --- a/tests/check_xalloc.c +++ b/tests/check_xalloc.c @@ -90,9 +90,9 @@ xalloc_suite(void) int main(void) { - unsigned int num_failed; - Suite *s; - SRunner *sr; + int num_failed; + Suite *s; + SRunner *sr; s = xalloc_suite(); sr = srunner_create(s);