diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 18:46:26 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 18:46:26 +0000 |
| commit | 324bfeb5e255e490809e91ccd615d7d9b538984c (patch) | |
| tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-ymsg.c | |
| parent | 7b25ae429b0dab3ed9566f8a9d1a069216bc69e4 (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-ymsg.c')
| -rw-r--r-- | epan/dissectors/packet-ymsg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 40938000a3..492fc6c59a 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -437,7 +437,7 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (content_len) { /* Create content subtree */ content_item = proto_tree_add_item(ymsg_tree, hf_ymsg_content, tvb, - offset, -1, TRUE); + offset, -1, ENC_ASCII|ENC_NA); content_tree = proto_item_add_subtree(content_item, ett_ymsg_content); /* Each entry consists of: @@ -475,9 +475,9 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* And add the key and value separately inside */ proto_tree_add_item(content_line_tree, hf_ymsg_content_line_key, tvb, - offset, keylen, FALSE); + offset, keylen, ENC_ASCII|ENC_NA); proto_tree_add_item(content_line_tree, hf_ymsg_content_line_value, tvb, - offset+keylen+2, vallen, FALSE); + offset+keylen+2, vallen, ENC_ASCII|ENC_NA); /* Move beyone key and value lines */ offset += keylen+2+vallen+2; |