diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-10-23 14:04:19 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-10-23 14:04:19 +0000 |
commit | b8003ea06ed95295e8568babd89ca6598251272f (patch) | |
tree | 4fc23055a5d6084b074dd34a3d8355f5e6b1d274 | |
parent | e717ca06bd12585727d35508cbe84a150b16b441 (diff) |
g_slist_free_full() is glib 2.28
Fix spelling.
svn path=/trunk/; revision=52787
-rw-r--r-- | epan/addr_resolv.c | 55 | ||||
-rw-r--r-- | epan/addr_resolv.h | 2 | ||||
-rw-r--r-- | ui/gtk/main.c | 2 |
3 files changed, 40 insertions, 19 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 3a502d5a0c..a0fc47f222 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -263,8 +263,8 @@ static GHashTable *ipxnet_hash_table = NULL; static GHashTable *ipv4_hash_table = NULL; static GHashTable *ipv6_hash_table = NULL; -static GSList *manual_resolved_ipv4_list = NULL; -static GSList *manual_resolved_ipv6_list = NULL; +static GSList *manually_resolved_ipv4_list = NULL; +static GSList *manually_resolved_ipv6_list = NULL; typedef struct _resolved_ipv4 { @@ -2188,12 +2188,12 @@ add_ip_name_from_string (const char *addr, const char *name) resolved_ipv6_entry = g_new(resolved_ipv6_t, 1); memcpy(&(resolved_ipv6_entry->ip6_addr), &ip6_addr, 16); g_strlcpy(resolved_ipv6_entry->name, name, MAXNAMELEN); - manual_resolved_ipv6_list = g_slist_prepend(manual_resolved_ipv6_list, resolved_ipv6_entry); + manually_resolved_ipv6_list = g_slist_prepend(manually_resolved_ipv6_list, resolved_ipv6_entry); } else { resolved_ipv4_entry = g_new(resolved_ipv4_t, 1); resolved_ipv4_entry->host_addr = host_addr[0]; g_strlcpy(resolved_ipv4_entry->name, name, MAXNAMELEN); - manual_resolved_ipv4_list = g_slist_prepend(manual_resolved_ipv4_list, resolved_ipv4_entry); + manually_resolved_ipv4_list = g_slist_prepend(manually_resolved_ipv4_list, resolved_ipv4_entry); } return TRUE; @@ -2779,12 +2779,12 @@ add_manually_resolved_ipv6(gpointer data, gpointer user_data _U_) static void add_manually_resolved(void) { - if(manual_resolved_ipv4_list){ - g_slist_foreach(manual_resolved_ipv4_list, add_manually_resolved_ipv4, NULL); + if(manually_resolved_ipv4_list){ + g_slist_foreach(manually_resolved_ipv4_list, add_manually_resolved_ipv4, NULL); } - if(manual_resolved_ipv6_list){ - g_slist_foreach(manual_resolved_ipv6_list, add_manually_resolved_ipv6, NULL); + if(manually_resolved_ipv6_list){ + g_slist_foreach(manually_resolved_ipv6_list, add_manually_resolved_ipv6, NULL); } } @@ -2929,16 +2929,37 @@ host_name_lookup_cleanup(void) new_resolved_objects = FALSE; } -void -manual_resolve_cleanup(void) +static void +free_manually_resolved_ipv4(gpointer data, gpointer user_data _U_) { - if(manual_resolved_ipv4_list){ - g_slist_free_full(manual_resolved_ipv4_list, g_free); - manual_resolved_ipv4_list = NULL; - } - if(manual_resolved_ipv6_list){ - g_slist_free_full(manual_resolved_ipv6_list, g_free); - manual_resolved_ipv6_list = NULL; + resolved_ipv4_t *resolved_ipv4_entry = (resolved_ipv4_t *)data; + + g_free(resolved_ipv4_entry); + +} + +static void +free_manually_resolved_ipv6(gpointer data, gpointer user_data _U_) +{ + resolved_ipv6_t *resolved_ipv6_entry = (resolved_ipv6_t *)data; + + g_free(resolved_ipv6_entry); + +} + +void +manually_resolve_cleanup(void) +{ + if(manually_resolved_ipv4_list){ + g_slist_foreach(manually_resolved_ipv4_list, free_manually_resolved_ipv4, NULL); + g_slist_free(manually_resolved_ipv4_list); + manually_resolved_ipv4_list = NULL; + } + + if(manually_resolved_ipv6_list){ + g_slist_foreach(manually_resolved_ipv6_list, free_manually_resolved_ipv6, NULL); + g_slist_free(manually_resolved_ipv6_list); + manually_resolved_ipv6_list = NULL; } } diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 9161199a3f..6729d60718 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -357,7 +357,7 @@ WS_DLL_LOCAL void addr_resolv_cleanup(void); WS_DLL_PUBLIC -void manual_resolve_cleanup(void); +void manually_resolve_cleanup(void); #ifdef __cplusplus } diff --git a/ui/gtk/main.c b/ui/gtk/main.c index fe2e5284a2..2687815cc7 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1390,7 +1390,7 @@ main_cf_cb_file_closing(capture_file *cf) gtk_window_set_position(GTK_WINDOW(close_dlg), GTK_WIN_POS_CENTER_ON_PARENT); } /* Clear maunally resolved addresses */ - manual_resolve_cleanup(); + manually_resolve_cleanup(); /* Destroy all windows that refer to the capture file we're closing. */ destroy_packet_wins(); |