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/qt/sequence_diagram.cpp | |
parent | 9a7318a184e25e08d1c8449e3f826e0a5c66ca3b (diff) | |
download | wireshark-22b4ec91c006fec65e655ccbb0dbbc32438f820b.tar.gz |
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/qt/sequence_diagram.cpp')
-rw-r--r-- | ui/qt/sequence_diagram.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp index 3bd4c2d724..bdca224650 100644 --- a/ui/qt/sequence_diagram.cpp +++ b/ui/qt/sequence_diagram.cpp @@ -104,6 +104,7 @@ void SequenceDiagram::setData(seq_analysis_info_t *sainfo) QVector<QString> key_labels, val_labels, com_labels; QFontMetrics com_fm(comment_axis_->tickLabelFont()); int elide_w = com_fm.height() * max_comment_em_width_; + char* addr_str; for (GList *cur = g_queue_peek_nth_link(sainfo->items, 0); cur; cur = g_list_next(cur)) { seq_analysis_item_t *sai = (seq_analysis_item_t *) cur->data; @@ -123,10 +124,13 @@ void SequenceDiagram::setData(seq_analysis_info_t *sainfo) for (unsigned int i = 0; i < sainfo_->num_nodes; i++) { val_ticks.append(i); - val_labels.append(ep_address_to_display(&(sainfo_->nodes[i]))); + addr_str = (char*)address_to_display(NULL, &(sainfo_->nodes[i])); + val_labels.append(addr_str); if (i % 2 == 0) { val_labels.last().append("\n"); } + + wmem_free(NULL, addr_str); } keyAxis()->setTickVector(key_ticks); keyAxis()->setTickVectorLabels(key_labels); |