diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-08 20:36:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-09 03:49:13 +0000 |
| commit | 8ff944d4ab892521c6a32fe40f6a410640a34d34 (patch) | |
| tree | cb9bb5956a1073babc778b2f75fd2d83a52608e3 /epan/to_str.h | |
| parent | 2875cd382fdc0efd5d949f674a0328ecf918b7e9 (diff) | |
| download | wireshark-8ff944d4ab892521c6a32fe40f6a410640a34d34.tar.gz | |
Add fixed length function for address types.
This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c. Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file.
Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4
Reviewed-on: https://code.wireshark.org/review/7038
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/to_str.h')
| -rw-r--r-- | epan/to_str.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/to_str.h b/epan/to_str.h index 56570e87fd..1eb46e3791 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -65,7 +65,6 @@ WS_DLL_PUBLIC void address_to_str_buf(const address *addr, gchar *buf, int b void ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len); void ip6_to_str_buf(const struct e_in6_addr *, gchar *); -extern gchar* ipx_addr_to_str(const guint32, const guint8 *); extern gchar* ipxnet_to_str_punct(wmem_allocator_t *scope, const guint32 ad, const char punct); WS_DLL_PUBLIC gchar* eui64_to_str(wmem_allocator_t *scope, const guint64 ad); @@ -104,7 +103,7 @@ WS_DLL_PUBLIC const gchar* port_type_to_str (port_type type); * @return A pointer to the formatted string * */ -WS_DLL_PUBLIC gchar* tvb_address_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, address_type type, const gint offset); +WS_DLL_PUBLIC gchar* tvb_address_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, int type, const gint offset); /** Turn an address type retrieved from a tvb into a string. * |