osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2015-01-16 23:18:46 -05:00
parent 5c5b3f7d26
commit 77dac91eb0
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/stats_tree/pinfo_stats_tree.c
View File

@ -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_) {

7
ui/gtk/prefs_dlg.c
View File

@ -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;
}