osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

g_slist_free_full: Use g_slist_free_full() in a couple of places. 

Change-Id: I38617ee289196f9807cf285af60d670bd5477687
Reviewed-on: https://code.wireshark.org/review/27327
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2018-05-04 10:16:28 +02:00 committed by Anders Broman
parent 8815ac76db
commit 3f49c0d3ca
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-frame.c
View File

@ -193,7 +193,7 @@ register_frame_end_routine(packet_info *pinfo, void (*func)(void))
typedef void (*void_func_t)(void);
static void
call_frame_end_routine(gpointer routine, gpointer dummy _U_)
call_frame_end_routine(gpointer routine)
{
void_func_t func = (void_func_t)routine;
(*func)();
@ -731,8 +731,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
if (pinfo->frame_end_routines) {
g_slist_foreach(pinfo->frame_end_routines, &call_frame_end_routine, NULL);
g_slist_free(pinfo->frame_end_routines);
g_slist_free_full(pinfo->frame_end_routines, &call_frame_end_routine);
pinfo->frame_end_routines = NULL;
}

6
epan/dissectors/packet-zbee-nwk-gp.c
View File

@ -1486,7 +1486,7 @@ gp_init_zbee_security(void)
}
}
static void zbee_free_key_record(gpointer ptr, gpointer user_data _U_)
static void zbee_free_key_record(gpointer ptr)
{
key_record_t *k;
@ -1504,9 +1504,7 @@ gp_cleanup_zbee_security(void)
if (!zbee_gp_keyring)
return;
g_slist_foreach(zbee_gp_keyring, zbee_free_key_record, NULL);
g_slist_free(zbee_gp_keyring);
g_slist_free_full(zbee_gp_keyring, zbee_free_key_record);
zbee_gp_keyring = NULL;
}

8
tshark.c
View File

@ -266,7 +266,7 @@ string_compare(gconstpointer a, gconstpointer b)
}
static void
string_elem_print(gpointer data, gpointer not_used _U_)
string_elem_print(gpointer data)
{
fprintf(stderr, " %s - %s\n",
((struct string_elem *)data)->sstr,
@ -289,8 +289,7 @@ list_capture_types(void) {
list = g_slist_insert_sorted(list, &captypes[i], string_compare);
}
}
g_slist_foreach(list, string_elem_print, NULL);
g_slist_free(list);
g_slist_free_full(list, string_elem_print);
g_free(captypes);
}
@ -311,8 +310,7 @@ list_read_capture_types(void) {
captypes[i].lstr = (open_routines[i].type == OPEN_INFO_MAGIC) ? magic : heuristic;
list = g_slist_insert_sorted(list, &captypes[i], string_compare);
}
g_slist_foreach(list, string_elem_print, NULL);
g_slist_free(list);
g_slist_free_full(list, string_elem_print);
g_free(captypes);
}