diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-26 10:52:37 -0400 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-27 15:20:06 +0000 |
| commit | 2ab415579491e4bc66ea58627bda504cae833b9e (patch) | |
| tree | 0f7f8eaa4bd9d90c8f6066036522ef0fc65d137d /epan/dissectors/packet-extreme.c | |
| parent | 8c37621ca733a24a972e3e069a537c06e650f435 (diff) | |
tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
Also some other tricks to remove unnecessary tvb_get_string_enc calls.
Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
Reviewed-on: https://code.wireshark.org/review/16158
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-extreme.c')
| -rw-r--r-- | epan/dissectors/packet-extreme.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 178954706b..92693063fa 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -417,7 +417,7 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p { proto_item *display_item; proto_tree *display_tree; - guint8 *display_name; + const guint8 *display_name; display_item = proto_tree_add_item(tree, hf_edp_display, tvb, offset, length, ENC_BIG_ENDIAN); @@ -428,11 +428,10 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p offset += 4; length -= 4; - display_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); + proto_tree_add_item_ret_string(display_tree, hf_edp_display_string, tvb, offset, length, + ENC_ASCII, wmem_packet_scope(), &display_name); proto_item_append_text(display_item, ": \"%s\"", format_text(display_name, strlen(display_name))); - proto_tree_add_string(display_tree, hf_edp_display_string, tvb, offset, length, - display_name); } static int @@ -538,7 +537,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot proto_item *vlan_item; proto_tree *vlan_tree; guint16 vlan_id; - guint8 *vlan_name; + const guint8 *vlan_name; vlan_item = proto_tree_add_item(tree, hf_edp_vlan, tvb, offset, length, ENC_BIG_ENDIAN); @@ -608,11 +607,10 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot offset += 4; length -= 4; - vlan_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); + proto_tree_add_item_ret_string(vlan_tree, hf_edp_vlan_name, tvb, offset, length, + ENC_ASCII, wmem_packet_scope(), &vlan_name); proto_item_append_text(vlan_item, ", Name \"%s\"", format_text(vlan_name, strlen(vlan_name))); - proto_tree_add_string(vlan_tree, hf_edp_vlan_name, tvb, offset, length, - vlan_name); offset += length; |