diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-17 21:17:24 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-18 04:15:18 +0000 |
| commit | a1f2342e13c576ae4899bd11e54d350b1ea23625 (patch) | |
| tree | 5cbd19df87aecbcfb7ce6b145fbf9bcd7bb2ff39 /epan/addr_resolv.c | |
| parent | ef7e8aa065a485edf4a9aba299ceb15a19ae0dd0 (diff) | |
| download | wireshark-a1f2342e13c576ae4899bd11e54d350b1ea23625.tar.gz wireshark-a1f2342e13c576ae4899bd11e54d350b1ea23625.tar.bz2 wireshark-a1f2342e13c576ae4899bd11e54d350b1ea23625.zip | |
Miscellaneous ep_strdup_printf replacement.
Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa
Reviewed-on: https://code.wireshark.org/review/6605
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/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 8d3d8c7f93..d1993e70b9 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -3026,8 +3026,8 @@ get_ipxnet_addr(const gchar *name, gboolean *known) } /* get_ipxnet_addr */ -const gchar * -get_manuf_name(const guint8 *addr) +gchar * +get_manuf_name(wmem_allocator_t *allocator, const guint8 *addr) { gchar *cur; int manuf_key; @@ -3043,11 +3043,11 @@ get_manuf_name(const guint8 *addr) manuf_key = manuf_key | oct; if (!gbl_resolv_flags.mac_name || ((cur = (gchar *)g_hash_table_lookup(manuf_hashtable, &manuf_key)) == NULL)) { - cur=ep_strdup_printf("%02x:%02x:%02x", addr[0], addr[1], addr[2]); + cur=wmem_strdup_printf(allocator, "%02x:%02x:%02x", addr[0], addr[1], addr[2]); return cur; } - return cur; + return wmem_strdup(allocator, cur); } /* get_manuf_name */ @@ -3059,13 +3059,13 @@ uint_get_manuf_name(const guint oid) addr[0] = (oid >> 16) & 0xFF; addr[1] = (oid >> 8) & 0xFF; addr[2] = (oid >> 0) & 0xFF; - return get_manuf_name(addr); + return get_manuf_name(wmem_packet_scope(), addr); } const gchar * tvb_get_manuf_name(tvbuff_t *tvb, gint offset) { - return get_manuf_name(tvb_get_ptr(tvb, offset, 3)); + return get_manuf_name(wmem_packet_scope(), tvb_get_ptr(tvb, offset, 3)); } const gchar * |