From 324bfeb5e255e490809e91ccd615d7d9b538984c Mon Sep 17 00:00:00 2001 From: wmeier 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). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39426 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-catapult-dct2000.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-catapult-dct2000.c') diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 77c770fea5..113af9d5d6 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1781,7 +1781,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) context_name = tvb_get_const_stringz(tvb, offset, &context_length); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_context, tvb, - offset, context_length, FALSE); + offset, context_length, ENC_ASCII|ENC_NA); } offset += context_length; @@ -1809,7 +1809,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) protocol_name = tvb_get_const_stringz(tvb, offset, &protocol_length); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_protocol, tvb, - offset, protocol_length, FALSE); + offset, protocol_length, ENC_ASCII|ENC_NA); } is_comment = (strcmp(protocol_name, "comment") == 0); offset += protocol_length; @@ -1819,7 +1819,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) variant_string = tvb_get_const_stringz(tvb, offset, &variant_length); if (!is_comment) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_variant, tvb, - offset, variant_length, FALSE); + offset, variant_length, ENC_ASCII|ENC_NA); } offset += variant_length; @@ -1827,7 +1827,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) outhdr_string = tvb_get_const_stringz(tvb, offset, &outhdr_length); if (!is_comment && (outhdr_length > 1)) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_outhdr, tvb, - offset, outhdr_length, FALSE); + offset, outhdr_length, ENC_ASCII|ENC_NA); } offset += outhdr_length; @@ -2009,7 +2009,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Show comment string */ string_ti = proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_comment, tvb, - offset, -1, FALSE); + offset, -1, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", string); if (catapult_dct2000_dissect_mac_lte_oob_messages) { -- cgit v1.2.3