summaryrefslogtreecommitdiff
path: root/epan/addr_resolv.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-08 13:16:01 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-09 07:44:54 +0000
commit284229c0f8a73666e4b330f0fd83ab255215ba99 (patch)
tree614151f5b1d3d7c4fcc0e8a67b8591f777580357 /epan/addr_resolv.h
parent17f1a44168cb0afeff32ab07058fb156a1d2b02b (diff)
downloadwireshark-284229c0f8a73666e4b330f0fd83ab255215ba99.tar.gz
Convert EUI64 address APIs to use wmem.
Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2 Reviewed-on: https://code.wireshark.org/review/6419 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/addr_resolv.h')
-rw-r--r--epan/addr_resolv.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 46f45bf6ce..3ba002df5c 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -216,13 +216,9 @@ WS_DLL_PUBLIC const gchar *tvb_get_manuf_name(tvbuff_t *tvb, gint offset);
*/
WS_DLL_PUBLIC const gchar *tvb_get_manuf_name_if_known(tvbuff_t *tvb, gint offset);
-/* ep_eui64_to_display returns "<vendor>_%02x:%02x:%02x:%02x:%02x:%02x" if the vendor code is known
+/* eui64_to_display returns "<vendor>_%02x:%02x:%02x:%02x:%02x:%02x" if the vendor code is known
"%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" */
-extern const gchar *ep_eui64_to_display(const guint64 addr);
-
-/* ep_eui64_to_display_if_known returns "<vendor>_%02x:%02x:%02x:%02x:%02x:%02x" if the vendor code is known else NULL */
-extern const gchar *ep_eui64_to_display_if_known(const guint64 addr);
-
+extern const gchar *eui64_to_display(wmem_allocator_t *allocator, const guint64 addr);
/* get_ipxnet_name returns the logical name if found in an ipxnets file,
* or a string formatted with "%X" if not */