diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-15 19:58:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-15 19:58:31 +0000 |
| commit | 782cc6e3c31c2f3d1c4ec9771e7c323995d5c6fa (patch) | |
| tree | 7016f1b411bc1cfb2d0cd29d1b972b6f9da5a35c /plugins/irda | |
| parent | 31abdcb584ed48002b54db6a6661e67a6b1b59e6 (diff) | |
Convert plugin files 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=39429
Diffstat (limited to 'plugins/irda')
| -rw-r--r-- | plugins/irda/packet-irda.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index ac61d5f99c..25f92dc05d 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -626,10 +626,10 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r switch (op) { case GET_VALUE_BY_CLASS: - proto_tree_add_item(tree, hf_iap_class_name, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_iap_class_name, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN); offset += 1 + clen; - proto_tree_add_item(tree, hf_iap_attr_name, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_iap_attr_name, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN); offset += 1 + alen; break; } @@ -838,7 +838,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro if (!iap_conv || !iap_conv->pattr_dissector || !iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, entry_tree, n, type)) - proto_tree_add_item(entry_tree, hf_iap_string, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(entry_tree, hf_iap_string, tvb, offset + 1, 1, ENC_ASCII|ENC_BIG_ENDIAN); break; } offset += attr_len; @@ -1618,7 +1618,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro col_append_str(pinfo->cinfo, COL_INFO, "\""); if (root) proto_tree_add_item(lmp_tree, hf_lmp_xid_name, tvb, offset, - -1, FALSE); + -1, ENC_ASCII|ENC_NA); } else { @@ -1672,7 +1672,7 @@ static void dissect_log(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) if (pinfo->pseudo_header->irda.pkttype == IRDA_MISSED_MSG) proto_tree_add_item(tree, hf_log_missed, tvb, 0, 0, FALSE); else - proto_tree_add_item(tree, hf_log_msg, tvb, 0, -1, FALSE); + proto_tree_add_item(tree, hf_log_msg, tvb, 0, -1, ENC_ASCII|ENC_NA); } } |