diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-19 20:53:44 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-19 20:53:44 +0000 |
| commit | 6be37815a19a8b34713831d131c1843d1f20ed7e (patch) | |
| tree | d6b217db73573a3e05b1e269a93cc7e1dec94e87 /plugins | |
| parent | 1ed5971a72e53ed182d6ac90ac0c313b6bcdc234 (diff) | |
Add bytestring_to_str() which takes a wmem scope and is otherwise identical to
bytestring_to_ep_str (now deprecated). Use the new one in a few obvious places.
Also just print directly to the buffer when loading ethernet addresses for
resolution. The straight-to-buffer bytes_to_hexstr seems useful, maybe it
shouldn't be in a private header...
svn path=/trunk/; revision=54270
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 6662b5bac5..9f70311e85 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -1070,7 +1070,7 @@ static void wimaxasncp_dissect_tlv_value( const gchar *format1; const gchar *format2; const guint8 *p = tvb_get_ptr(tvb, offset, length); - const gchar *s = bytestring_to_ep_str(p, MIN(length, max_show_bytes), 0); + const gchar *s = bytestring_to_str(wmem_packet_scope(), p, MIN(length, max_show_bytes), 0); if (length <= max_show_bytes) { @@ -1250,7 +1250,7 @@ static void wimaxasncp_dissect_tlv_value( { const gchar *format; const guint8 *p = tvb_get_ptr(tvb, offset, length); - const gchar *s = bytestring_to_ep_str(p, MIN(length, max_show_bytes), 0); + const gchar *s = bytestring_to_str(wmem_packet_scope(), p, MIN(length, max_show_bytes), 0); if (length <= max_show_bytes) { @@ -1770,7 +1770,7 @@ static void wimaxasncp_dissect_tlv_value( const gchar *format2; const guint8 *p = tvb_get_ptr(tvb, offset, length); const gchar *s = - bytestring_to_ep_str(p, MIN(length, max_show_bytes), 0); + bytestring_to_str(wmem_packet_scope(), p, MIN(length, max_show_bytes), 0); if (length <= max_show_bytes) { @@ -1810,7 +1810,7 @@ static void wimaxasncp_dissect_tlv_value( { const gchar *format; const guint8 *p = tvb_get_ptr(tvb, offset, length); - const gchar *s = bytestring_to_ep_str(p, MIN(length, max_show_bytes), 0); + const gchar *s = bytestring_to_str(wmem_packet_scope(), p, MIN(length, max_show_bytes), 0); if (length <= max_show_bytes) { |