g_free(elem);
}
-static void
-capture_opts_free_interface_t_addrs(gpointer elem, gpointer unused _U_)
-{
- g_free(elem);
-}
-
void
capture_opts_free_interface_t(interface_t *device)
{
g_free(device->if_info.name);
g_free(device->if_info.friendly_name);
g_free(device->if_info.vendor_description);
- g_slist_foreach(device->if_info.addrs,
- capture_opts_free_interface_t_addrs, NULL);
- g_slist_free(device->if_info.addrs);
+ g_slist_free_full(device->if_info.addrs, g_free);
g_free(device->if_info.extcap);
}
}
}
#endif /* HAVE_PCAP_FINDALLDEVS */
-static void
-free_if_info_addr_cb(gpointer addr, gpointer user_data _U_)
-{
- g_free(addr);
-}
-
static void
free_if_cb(gpointer data, gpointer user_data _U_)
{
g_free(if_info->friendly_name);
g_free(if_info->vendor_description);
g_free(if_info->extcap);
- g_slist_foreach(if_info->addrs, free_if_info_addr_cb, NULL);
- g_slist_free(if_info->addrs);
+ g_slist_free_full(if_info->addrs, g_free);
g_free(if_info);
}
/* delete the specified filter (called from g_slist_foreach) */
static void
-color_filter_delete_cb(gpointer filter_arg, gpointer unused _U_)
+color_filter_delete_cb(gpointer filter_arg)
{
color_filter_t *colorf = (color_filter_t *)filter_arg;
void
color_filter_list_delete(GSList **cfl)
{
- g_slist_foreach(*cfl, color_filter_delete_cb, NULL);
- g_slist_free(*cfl);
+ g_slist_free_full(*cfl, color_filter_delete_cb);
*cfl = NULL;
}
G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED, NULL);
}
-static void
-col_custom_ids_free_wrapper(gpointer data, gpointer user_data _U_)
-{
- g_free(data);
-}
-
static void
col_custom_fields_ids_free(GSList** custom_fields_id)
{
if (*custom_fields_id != NULL) {
- g_slist_foreach(*custom_fields_id, col_custom_ids_free_wrapper, NULL);
- g_slist_free(*custom_fields_id);
+ g_slist_free_full(*custom_fields_id, g_free);
}
*custom_fields_id = NULL;
}
}
static void
-slist_stnode_free(gpointer data, gpointer user_data _U_)
+slist_stnode_free(gpointer data)
{
stnode_free((stnode_t *)data);
}
void
st_funcparams_free(GSList *params)
{
- g_slist_foreach(params, slist_stnode_free, NULL);
- g_slist_free(params);
+ g_slist_free_full(params, slist_stnode_free);
}
static void
#include "sttype-set.h"
static void
-slist_stnode_free(gpointer data, gpointer user_data _U_)
+slist_stnode_free(gpointer data)
{
stnode_free((stnode_t *)data);
}
void
set_nodelist_free(GSList *params)
{
- g_slist_foreach(params, slist_stnode_free, NULL);
- g_slist_free(params);
+ g_slist_free_full(params, slist_stnode_free);
}
void
{
}
-static void
-free_list_element(gpointer elem, gpointer data _U_)
-{
- g_free(elem);
-}
-
void export_pdu_cleanup(void)
{
- g_slist_foreach(export_pdu_tap_name_list, free_list_element, NULL);
- g_slist_free(export_pdu_tap_name_list);
+ g_slist_free_full(export_pdu_tap_name_list, g_free);
}
/*
depend_dissector_list_t dissector_list = (depend_dissector_list_t)data;
GSList **list = &(dissector_list->dissectors);
- g_slist_foreach(*list, (GFunc)g_free, NULL);
- g_slist_free(*list);
+ g_slist_free_full(*list, g_free);
g_slice_free(struct depend_dissector_list, dissector_list);
}
static GHashTable* heuristic_short_names = NULL;
static void
-destroy_heuristic_dissector_entry(gpointer data, gpointer user_data _U_)
+destroy_heuristic_dissector_entry(gpointer data)
{
heur_dtbl_entry_t *hdtbl_entry = (heur_dtbl_entry_t *)data;
g_free(hdtbl_entry->list_name);
heur_dissector_list_t dissector_list = (heur_dissector_list_t)data;
GSList **list = &(dissector_list->dissectors);
- g_slist_foreach(*list, destroy_heuristic_dissector_entry, NULL);
- g_slist_free(*list);
+ g_slist_free_full(*list, destroy_heuristic_dissector_entry);
g_slice_free(struct heur_dissector_list, dissector_list);
}