From 126aa8539380e6b0b465b48d30f349b76afdc489 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sat, 15 Oct 2011 18:46:26 +0000 Subject: Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426 --- epan/dissectors/packet-dcp-etsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-dcp-etsi.c') diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 86ba3dde61..272b9a24e5 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -450,7 +450,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { /* we are being asked for details */ ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, ENC_BIG_ENDIAN); pft_tree = proto_item_add_subtree (ti, ett_pft); - proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA); } offset += 2; seq = tvb_get_ntohs (tvb, offset); @@ -552,7 +552,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { /* we are being asked for details */ ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, ENC_BIG_ENDIAN); af_tree = proto_item_add_subtree (ti, ett_af); - proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA); } offset += 2; payload_len = tvb_get_ntohl(tvb, offset); -- cgit v1.2.3