From 1a54112c1d437d48c7dee4d7d37aeeab0b3507d8 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 2 Mar 2015 09:33:52 -0500 Subject: Add tvb_get_ether_name This is mostly to reduce tvb_get_ptr calls that were used to pass into get_ether_name. Some optimizations were made to packet-ieee80211.c in the process of conversion. Change-Id: I81d3c65d4c09a15237fc287c2e989eb6e6936b1f Reviewed-on: https://code.wireshark.org/review/7492 Reviewed-by: Anders Broman --- epan/dissectors/packet-ubertooth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-ubertooth.c') diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index 8b7fefdb6f..77836d4b89 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1598,7 +1598,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat case 56: /* BTLE Set Target */ proto_tree_add_item(main_tree, hf_bdaddr, tvb, offset, 6, ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", - get_ether_name((char *) tvb_memdup(wmem_packet_scope(), tvb, offset, 6))); + tvb_get_ether_name(tvb, offset)); offset += 6; break; -- cgit v1.2.3