aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.h
diff options
context:
space:
mode:
authorAnders Broman <a.broman58@gmail.com>2015-02-12 08:33:02 +0000
committerAnders Broman <a.broman58@gmail.com>2015-02-12 08:34:05 +0000
commit53228c4bd8d64dae077c90496da738c0da75f20f (patch)
treedcd8a243e2e7cc228af511678dc4d93eade9f8bc /epan/addr_resolv.h
parent797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac (diff)
Revert "Make get_manuf_name return a const string."
This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac. Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4 Reviewed-on: https://code.wireshark.org/review/7076 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, 1 insertions, 7 deletions
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 068a741460..eda5885bb8 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -59,9 +59,6 @@ typedef struct _e_addr_resolve {
struct hashether;
typedef struct hashether hashether_t;
-struct hashmanuf;
-typedef struct hashmanuf hashmanuf_t;
-
typedef struct serv_port {
gchar *udp_name;
gchar *tcp_name;
@@ -180,7 +177,7 @@ gchar *get_ether_name_if_known(const guint8 *addr);
* Given a sequence of 3 octets containing an OID, get_manuf_name()
* returns the vendor name, or "%02x:%02x:%02x" if not known.
*/
-extern const gchar *get_manuf_name(const guint8 *addr);
+extern gchar *get_manuf_name(wmem_allocator_t *allocator, const guint8 *addr);
/*
* Given a sequence of 3 octets containing an OID, get_manuf_name_if_known()
@@ -226,9 +223,6 @@ WS_DLL_PUBLIC guint get_hash_ether_status(hashether_t* ether);
WS_DLL_PUBLIC char* get_hash_ether_hexaddr(hashether_t* ether);
WS_DLL_PUBLIC char* get_hash_ether_resolved_name(hashether_t* ether);
-WS_DLL_PUBLIC char* get_hash_manuf_resolved_name(hashmanuf_t* manuf);
-
-
/* returns the ethernet address corresponding to name or NULL if not known */
extern guint8 *get_ether_addr(const gchar *name);