diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 18:13:23 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-08 05:43:51 +0000 |
| commit | 4a5ca5c76e199694bba8a21418f52ca0f30322d1 (patch) | |
| tree | 00b8ed5cce77a17af6e0fb388fe42c6ffa8a9262 /ui/qt | |
| parent | 22096781499c7159ff504f7baa743d295aad06bc (diff) | |
bytes_to_ep_str -> bytes_to_str
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750
Reviewed-on: https://code.wireshark.org/review/6389
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/lbm_stream_dialog.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/lbm_uimflow_dialog.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/uat_dialog.cpp | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index 3fecb31260..657f1b68d1 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -193,7 +193,7 @@ QString LBMStreamEntry::formatEndpoint(const packet_info * pinfo, const lbm_uim_ { if (endpoint->type == lbm_uim_instance_stream) { - return QString(bytes_to_ep_str(endpoint->stream_info.ctxinst.ctxinst, sizeof(endpoint->stream_info.ctxinst.ctxinst))); + return QString(bytes_to_str(pinfo->pool, endpoint->stream_info.ctxinst.ctxinst, sizeof(endpoint->stream_info.ctxinst.ctxinst))); } else { diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index 11a5a82c42..a6c253bdbf 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -133,8 +133,8 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ } if (epa.type == lbm_uim_instance_stream) { - ctxinst1 = bytes_to_ep_str(epa.stream_info.ctxinst.ctxinst, sizeof(epa.stream_info.ctxinst.ctxinst)); - ctxinst2 = bytes_to_ep_str(epb.stream_info.ctxinst.ctxinst, sizeof(epb.stream_info.ctxinst.ctxinst)); + ctxinst1 = bytes_to_str(pinfo->pool, epa.stream_info.ctxinst.ctxinst, sizeof(epa.stream_info.ctxinst.ctxinst)); + ctxinst2 = bytes_to_str(pinfo->pool, epb.stream_info.ctxinst.ctxinst, sizeof(epb.stream_info.ctxinst.ctxinst)); item->comment = g_strdup_printf("%s <-> %s [%" G_GUINT64_FORMAT "]", ctxinst1, ctxinst2, diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp index bd6d9b768f..9a1128ae32 100644 --- a/ui/qt/uat_dialog.cpp +++ b/ui/qt/uat_dialog.cpp @@ -173,7 +173,12 @@ QString UatDialog::fieldString(guint row, guint column) string_rep = str; break; case PT_TXTMOD_HEXBYTES: { - string_rep = bytes_to_ep_str((const guint8 *) str, length); + { + char* temp_str = bytes_to_str(NULL, (const guint8 *) str, length); + QString qstr(temp_str); + string_rep = qstr; + wmem_free(NULL, temp_str); + } break; } default: |