From 232cb9a2dd87ea9cc9c88d4c32bfb7b452705130 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 15 Dec 2016 13:01:27 -0500 Subject: Remove proto_item_append_text calls in favor of BASE_UNIT_STRING. Many proto_item_append_text calls were just adding a unit string to a field. There's a better way to do that now. Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78 Reviewed-on: https://code.wireshark.org/review/19289 Petri-Dish: Michael Mann Reviewed-by: Michael Mann --- epan/dissectors/packet-usb-com.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'epan/dissectors/packet-usb-com.c') diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c index dd03aa5ac6..f34bdefe2a 100644 --- a/epan/dissectors/packet-usb-com.c +++ b/epan/dissectors/packet-usb-com.c @@ -747,11 +747,9 @@ dissect_usb_com_interrupt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v offset += 2; proto_tree_add_item(subtree, hf_usb_com_interrupt_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - it = proto_tree_add_item(subtree, hf_usb_com_interrupt_dl_bitrate, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(it, " b/s"); + proto_tree_add_item(subtree, hf_usb_com_interrupt_dl_bitrate, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - it = proto_tree_add_item(subtree, hf_usb_com_interrupt_ul_bitrate, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(it, " b/s"); + proto_tree_add_item(subtree, hf_usb_com_interrupt_ul_bitrate, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; break; default: @@ -1048,11 +1046,11 @@ proto_register_usb_com(void) { "Length", "usbcom.interrupt.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_usb_com_interrupt_dl_bitrate, - { "DL Bitrate", "usbcom.interrupt.conn_speed_change.dl_bitrate", FT_UINT32, BASE_DEC, - NULL, 0, NULL, HFILL }}, + { "DL Bitrate", "usbcom.interrupt.conn_speed_change.dl_bitrate", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, + &units_bit_sec, 0, NULL, HFILL }}, { &hf_usb_com_interrupt_ul_bitrate, - { "UL Bitrate", "usbcom.interrupt.conn_speed_change.ul_bitrate", FT_UINT32, BASE_DEC, - NULL, 0, NULL, HFILL }}, + { "UL Bitrate", "usbcom.interrupt.conn_speed_change.ul_bitrate", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, + &units_bit_sec, 0, NULL, HFILL }}, { &hf_usb_com_interrupt_payload, { "Payload", "usbcom.interrupt.payload", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }} -- cgit v1.2.3