diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
| commit | a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1 (patch) | |
| tree | 0eff98882fe8c8a9db6f064b87330b8060fe37b2 /ui | |
| parent | b7ab4db2108fda5a1370b807d1b03ad93b1ca8f8 (diff) | |
Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).
svn path=/trunk/; revision=54249
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/mcast_stream.c | 4 | ||||
| -rw-r--r-- | ui/qt/uat_dialog.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c index 77a76ebede..810d533de7 100644 --- a/ui/gtk/mcast_stream.c +++ b/ui/gtk/mcast_stream.c @@ -176,8 +176,8 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const * address (for IPv6). */ if ((pinfo->dl_dst.type != AT_ETHER) || - ((g_ascii_strncasecmp("01005E", bytes_to_str((const guint8 *)pinfo->dl_dst.data, pinfo->dl_dst.len), 6) != 0) && - (g_ascii_strncasecmp("3333", bytes_to_str((const guint8 *)pinfo->dl_dst.data, pinfo->dl_dst.len), 4) != 0)) ) + ((g_ascii_strncasecmp("01005E", bytes_to_ep_str((const guint8 *)pinfo->dl_dst.data, pinfo->dl_dst.len), 6) != 0) && + (g_ascii_strncasecmp("3333", bytes_to_ep_str((const guint8 *)pinfo->dl_dst.data, pinfo->dl_dst.len), 4) != 0)) ) return 0; /* check whether we already have a stream with these parameters in the list */ diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp index 9966418f80..bd00bf8525 100644 --- a/ui/qt/uat_dialog.cpp +++ b/ui/qt/uat_dialog.cpp @@ -172,7 +172,7 @@ QString UatDialog::fieldString(guint row, guint column) string_rep = str; break; case PT_TXTMOD_HEXBYTES: { - string_rep = bytes_to_str((const guint8 *) str, length); + string_rep = bytes_to_ep_str((const guint8 *) str, length); break; } default: |