From df79047cb62c26755f35083557686828849008b3 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 3 Nov 2018 08:38:04 +0000 Subject: GTK: Squash a couple of warnings from GCC 8.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit frontends/gtk/download.c: In function ‘nsgtk_download_do’: frontends/gtk/download.c:238:24: warning: cast between incompatible function types from ‘void (*)(GtkTreePath *)’ {aka ‘void (*)(struct _GtkTreePath *)’} to ‘void (*)(void *, void *)’ [-Wcast-function-type] g_list_foreach(rows, (GFunc)gtk_tree_path_free, NULL); ^ frontends/gtk/download.c:239:24: warning: cast between incompatible function types from ‘void (*)(void *)’ to ‘void (*)(void *, void *)’ [-Wcast-function-type] g_list_foreach(rows, (GFunc)g_free, NULL); ^ --- frontends/gtk/download.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/frontends/gtk/download.c b/frontends/gtk/download.c index d11036ea8..57f92bf25 100644 --- a/frontends/gtk/download.c +++ b/frontends/gtk/download.c @@ -212,6 +212,26 @@ static void nsgtk_download_sensitivity_evaluate(GtkTreeSelection *selection) nsgtk_download_sensitivity_update_buttons(sensitivity); } +/** + * Wrapper to GFunc-ify gtk_tree_path_free for g_list_foreach. + */ +static void nsgtk_download_gfunc__gtk_tree_path_free( + gpointer data, + gpointer user_data) +{ + gtk_tree_path_free(data); +} + +/** + * Wrapper to GFunc-ify g_free for g_list_foreach. + */ +static void nsgtk_download_gfunc__g_free( + gpointer data, + gpointer user_data) +{ + g_free(data); +} + static void nsgtk_download_do(nsgtk_download_selection_action action) { GList *rows, *dls = NULL; @@ -235,8 +255,8 @@ static void nsgtk_download_do(nsgtk_download_selection_action action) rows = rows->next; } - g_list_foreach(rows, (GFunc)gtk_tree_path_free, NULL); - g_list_foreach(rows, (GFunc)g_free, NULL); + g_list_foreach(rows, nsgtk_download_gfunc__gtk_tree_path_free, NULL); + g_list_foreach(rows, nsgtk_download_gfunc__g_free, NULL); g_list_free(rows); } else dls = g_list_copy(nsgtk_downloads_list); -- cgit v1.2.3