diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-04 21:40:05 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-05 13:55:04 +0000 |
| commit | 22b4ec91c006fec65e655ccbb0dbbc32438f820b (patch) | |
| tree | 033dc9de28b8a79550a4dd769fcfb249df4be38c /ui/tap-sequence-analysis.c | |
| parent | 9a7318a184e25e08d1c8449e3f826e0a5c66ca3b (diff) | |
Replace ep_display_to_address with wmem equivalent display_to_address.
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI.
Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9
Reviewed-on: https://code.wireshark.org/review/6318
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/tap-sequence-analysis.c')
| -rw-r--r-- | ui/tap-sequence-analysis.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index 6a15c18338..eb35b9125c 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -465,6 +465,7 @@ sequence_analysis_dump_to_file(const char *pathname, seq_analysis_info_t *sainfo char src_port[8], dst_port[8]; gchar *time_str; GList *list; + char *addr_str; FILE *of; @@ -522,8 +523,9 @@ sequence_analysis_dump_to_file(const char *pathname, seq_analysis_info_t *sainfo /* Write the node names on top */ for (i=0; i<display_nodes; i+=2) { /* print the node identifiers */ - g_string_printf(label_string, "| %s", - ep_address_to_display(&(sainfo->nodes[i+first_node]))); + addr_str = (char*)address_to_display(NULL, &(sainfo->nodes[i+first_node])); + g_string_printf(label_string, "| %s", addr_str); + wmem_free(NULL, addr_str); enlarge_string(label_string, NODE_CHARS_WIDTH*2, ' '); fprintf(of, "%s", label_string->str); g_string_printf(label_string, "| "); @@ -539,8 +541,9 @@ sequence_analysis_dump_to_file(const char *pathname, seq_analysis_info_t *sainfo /* Write the node names on top */ for (i=1; i<display_nodes; i+=2) { /* print the node identifiers */ - g_string_printf(label_string, "| %s", - ep_address_to_display(&(sainfo->nodes[i+first_node]))); + addr_str = (char*)address_to_display(NULL, &(sainfo->nodes[i+first_node])); + g_string_printf(label_string, "| %s", addr_str); + wmem_free(NULL, addr_str); if (label_string->len < NODE_CHARS_WIDTH) { enlarge_string(label_string, NODE_CHARS_WIDTH, ' '); |