From 19bb043a8506e874e819957a646c7ca47feb74a1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Jan 2023 13:15:05 -0500 Subject: [PATCH] testsuite: Fix various compiler warnings These are mostly dead stores that clang isn't happy with. --- testsuite/gtk/bitset.c | 1 + testsuite/gtk/recentmanager.c | 19 +++++++------------ testsuite/gtk/shortcuts.c | 2 ++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/testsuite/gtk/bitset.c b/testsuite/gtk/bitset.c index 655d95b110..dc06d80233 100644 --- a/testsuite/gtk/bitset.c +++ b/testsuite/gtk/bitset.c @@ -500,6 +500,7 @@ test_iter (void) g_assert_false (gtk_bitset_iter_next (&iter, &value)); ret = gtk_bitset_iter_init_at (&iter, set, 0, &value); + g_assert_false (ret); g_assert_false (gtk_bitset_iter_is_valid (&iter)); g_assert_cmpuint (gtk_bitset_iter_get_value (&iter), ==, 0); diff --git a/testsuite/gtk/recentmanager.c b/testsuite/gtk/recentmanager.c index dbbce1142e..df38d9e9ef 100644 --- a/testsuite/gtk/recentmanager.c +++ b/testsuite/gtk/recentmanager.c @@ -55,9 +55,8 @@ recent_manager_add (void) recent_data->app_exec = (char *)"testrecentchooser %u"; if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) { - res = gtk_recent_manager_add_full (manager, - uri, - recent_data); + res = gtk_recent_manager_add_full (manager, uri, recent_data); + g_assert_false (res); } g_test_trap_assert_failed (); @@ -67,9 +66,8 @@ recent_manager_add (void) recent_data->app_exec = (char *)"testrecentchooser %u"; if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) { - res = gtk_recent_manager_add_full (manager, - uri, - recent_data); + res = gtk_recent_manager_add_full (manager, uri, recent_data); + g_assert_false (res); } g_test_trap_assert_failed (); @@ -79,9 +77,8 @@ recent_manager_add (void) recent_data->app_exec = NULL; if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) { - res = gtk_recent_manager_add_full (manager, - uri, - recent_data); + res = gtk_recent_manager_add_full (manager, uri, recent_data); + g_assert_false (res); } g_test_trap_assert_failed (); @@ -90,9 +87,7 @@ recent_manager_add (void) recent_data->mime_type = (char *)"text/plain"; recent_data->app_name = (char *)"testrecentchooser"; recent_data->app_exec = (char *)"testrecentchooser %u"; - res = gtk_recent_manager_add_full (manager, - uri, - recent_data); + res = gtk_recent_manager_add_full (manager, uri, recent_data); g_assert_true (res); g_slice_free (GtkRecentData, recent_data); diff --git a/testsuite/gtk/shortcuts.c b/testsuite/gtk/shortcuts.c index ad5e9c798b..10a7913faa 100644 --- a/testsuite/gtk/shortcuts.c +++ b/testsuite/gtk/shortcuts.c @@ -39,6 +39,8 @@ test_trigger_basic (void) trigger = gtk_never_trigger_get (); + g_assert_true (GTK_IS_SHORTCUT_TRIGGER (trigger)); + trigger = gtk_keyval_trigger_new (GDK_KEY_a, GDK_CONTROL_MASK); g_assert_cmpint (gtk_keyval_trigger_get_keyval (GTK_KEYVAL_TRIGGER (trigger)), ==, GDK_KEY_a); g_assert_cmpint (gtk_keyval_trigger_get_modifiers (GTK_KEYVAL_TRIGGER (trigger)), ==, GDK_CONTROL_MASK); -- 2.30.2