diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-16 23:18:46 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-17 21:05:58 +0000 |
| commit | 77dac91eb046d66a3c1ca3547d7112a5dd920f90 (patch) | |
| tree | 645585dca5ea318705af5c59f8f7ed9b575737c0 | |
| parent | 5c5b3f7d26d0913be7aa1c0b77235c3fcddfbe9f (diff) | |
A few more emem replacements with wmem.
Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0
Reviewed-on: https://code.wireshark.org/review/6590
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | plugins/stats_tree/pinfo_stats_tree.c | 11 | ||||
| -rw-r--r-- | ui/gtk/prefs_dlg.c | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index a90f3f54f1..ec0095ca50 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -173,18 +173,17 @@ static const gchar *st_str_plen = "Packet Lengths"; static void plen_stats_tree_init(stats_tree *st) { guint i; - char **str_range_array = (char **)ep_alloc(num_plen_uat*sizeof(char*)); - char *tmp_str, *range_str; + char **str_range_array = (char **)wmem_alloc(NULL, num_plen_uat*sizeof(char*)); /* Convert the ranges to strings for the stats tree API */ for (i = 0; i < num_plen_uat; i++) { - tmp_str = range_convert_range(NULL, uat_plen_records[i].packet_range), - range_str = ep_strdup(tmp_str); - str_range_array[i] = range_str; - wmem_free(NULL, tmp_str); + str_range_array[i] = range_convert_range(NULL, uat_plen_records[i].packet_range); } st_node_plen = stats_tree_create_range_node_string(st, st_str_plen, 0, num_plen_uat, str_range_array); + for (i = 0; i < num_plen_uat; i++) { + wmem_free(NULL, str_range_array[i]); + } } static int plen_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 961c82398f..32b05363f0 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -225,14 +225,13 @@ pref_show(pref_t *pref, gpointer user_data) case PREF_RANGE: { - char *range_str_p, *tmp_range; + char *range_str_p; - tmp_range = range_convert_range(NULL, *pref->varp.range); - range_str_p = ep_strdup(tmp_range); - wmem_free(NULL, tmp_range); + range_str_p = range_convert_range(NULL, *pref->varp.range); pref->control = create_preference_entry(main_grid, pref->ordinal, label_string, tooltip_txt, range_str_p); + wmem_free(NULL, range_str_p); break; } |