From 7416f344a3c2d62042307f307f8ab36dba26d83d Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Fri, 19 Apr 2019 10:00:58 +0200 Subject: [PATCH] Use g_list_free_full() Signed-off-by: Quentin Glidic --- lexer/theme-lexer.l | 6 ++---- lexer/theme-parser.y | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index 003eee16..4ebeff7f 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -694,8 +694,7 @@ gboolean rofi_theme_parse_file ( const char *file ) } } // Free up. - g_list_foreach ( imported_files, (GFunc)g_free, NULL); - g_list_free ( imported_files ); + g_list_free_full ( imported_files, g_free ); g_queue_free ( file_queue ); imported_files = NULL; file_queue = NULL; @@ -730,8 +729,7 @@ gboolean rofi_theme_parse_string ( const char *string ) } } // Free up. - g_list_foreach ( imported_files, (GFunc)g_free, NULL); - g_list_free ( imported_files ); + g_list_free_full ( imported_files, g_free ); imported_files = NULL; g_queue_free ( file_queue ); file_queue = NULL; diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y index 2ec5de77..23b0a5dc 100644 --- a/lexer/theme-parser.y +++ b/lexer/theme-parser.y @@ -296,8 +296,7 @@ t_name_prefix_optional t_entry_name_path_selectors T_BOPEN t_property_list_optio for ( GList *iter = g_list_first ( (GList*)liter->data ); iter ; iter = g_list_next ( iter ) ) { widget = rofi_theme_find_or_create_name ( widget, iter->data ); } - g_list_foreach ( (GList*)liter->data, (GFunc)g_free , NULL ); - g_list_free ( (GList*)liter->data ); + g_list_free_full ( (GList*)liter->data, g_free ); widget->set = TRUE; rofi_theme_widget_add_properties ( widget, $4); }