diff --git a/AUTHORS b/AUTHORS index 6bbcf25670..c9a4ebaef8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1758,6 +1758,7 @@ And assorted fixes and enhancements by the people listed above and by: Marcio Franco Kaloian Stoilov Steven Lass + Nathan Jennings Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index d068d67265..42e279ed9f 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1842,6 +1842,7 @@ B. Marcio Franco Kaloian Stoilov Steven Lass + Nathan Jennings Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff --git a/pcap-util.c b/pcap-util.c index 116ad746e4..364971f285 100644 --- a/pcap-util.c +++ b/pcap-util.c @@ -1,7 +1,7 @@ /* pcap-util.c * Utility routines for packet capture * - * $Id: pcap-util.c,v 1.13 2003/06/13 02:37:42 guy Exp $ + * $Id: pcap-util.c,v 1.14 2003/07/06 00:07:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -381,10 +381,8 @@ get_interface_list(int *err, char *err_str) return il; fail: - if (il != NULL) { - g_list_foreach(il, free_if_cb, NULL); - g_list_free(il); - } + if (il != NULL) + free_interface_list(il); g_free(ifc.ifc_buf); close(sock); *err = CANT_GET_INTERFACE_LIST; @@ -519,10 +517,8 @@ free_if_cb(gpointer data, gpointer user_data _U_) void free_interface_list(GList *if_list) { - while (if_list != NULL) { - g_free(if_list->data); - if_list = g_list_remove_link(if_list, if_list); - } + g_list_foreach(if_list, free_if_cb, NULL); + g_list_free(if_list); } #endif /* HAVE_LIBPCAP */