summaryrefslogtreecommitdiff
path: root/ui/gtk/compare_stat.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-07 20:25:29 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-08 07:24:15 +0000
commit20414ebf4b6851fbe578732fb3b8fb948b32e7c9 (patch)
treeb4fd8804d97254d1898d78a01229bbb2646b06cf /ui/gtk/compare_stat.c
parentcff098e3eb6a871a1e39559d27b33dc3a3437c2c (diff)
downloadwireshark-20414ebf4b6851fbe578732fb3b8fb948b32e7c9.tar.gz
Replace some ep_alloc and ep_alloc0 with its wmem equivalent.
These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a Reviewed-on: https://code.wireshark.org/review/6392 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/compare_stat.c')
-rw-r--r--ui/gtk/compare_stat.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index bc3f15181e..82c14fc6e7 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -236,8 +236,8 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg)
guint i;
/* we only need one value out of pinfo we use a temp one */
- packet_info *pinfo=(packet_info*)ep_alloc(sizeof(packet_info));
- pinfo->fd=(frame_data*)ep_alloc(sizeof(frame_data));
+ packet_info *pinfo=(packet_info*)g_malloc(sizeof(packet_info));
+ pinfo->fd=(frame_data*)g_malloc(sizeof(frame_data));
pinfo->fd->num = fInfo->num;
fInfoTemp=(frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id));
@@ -300,6 +300,9 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg)
}
g_array_append_val(cs->ip_ttl_list, fInfo->ip_ttl);
}
+
+ g_free(pinfo->fd);
+ g_free(pinfo);
}
/*Create new numbering in the Info column, to create a zebra effect */