diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 19:58:31 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 19:58:31 +0000 |
| commit | 5d9ab19e0760c44e8078bb8493bf92814b7e3eb2 (patch) | |
| tree | 7016f1b411bc1cfb2d0cd29d1b972b6f9da5a35c /plugins/unistim | |
| parent | b6ca6031a88b1e7325479f2768bb3f577aa5b2b9 (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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39429 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins/unistim')
| -rw-r--r-- | plugins/unistim/packet-unistim.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 84fc0ac6fb..85690455f8 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -365,7 +365,7 @@ dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *t offset+=1; /* Get filename */ str_len = tvb_length_remaining(tvb, offset); - proto_tree_add_item(msg_tree,hf_uftp_filename,tvb,offset,str_len,FALSE); + proto_tree_add_item(msg_tree,hf_uftp_filename,tvb,offset,str_len,ENC_ASCII|ENC_NA); offset += str_len; break; @@ -545,7 +545,7 @@ dissect_basic_phone(proto_tree *msg_tree, case 0x02: /*Firmware Version*/ proto_tree_add_item(msg_tree,hf_basic_phone_fw_ver, - tvb,offset,msg_len,FALSE); + tvb,offset,msg_len,ENC_ASCII|ENC_NA); offset+=msg_len; break; case 0x03: @@ -562,7 +562,7 @@ dissect_basic_phone(proto_tree *msg_tree, case 0x08: /*Product Engineering Code*/ proto_tree_add_item(msg_tree,hf_basic_prod_eng_code, - tvb,offset,msg_len,FALSE); + tvb,offset,msg_len,ENC_ASCII|ENC_NA); offset+=msg_len; break; case 0x09: @@ -1077,7 +1077,7 @@ dissect_display_switch(proto_tree *msg_tree, set_ascii_item(msg_tree,tvb,offset,msg_len); offset+=msg_len; proto_tree_add_item(msg_tree,hf_generic_string, - tvb,offset,msg_len,FALSE); + tvb,offset,msg_len,ENC_ASCII|ENC_NA); offset+=msg_len; break; case 0x1b: @@ -1233,7 +1233,7 @@ dissect_display_switch(proto_tree *msg_tree, tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; proto_tree_add_item(msg_tree,hf_generic_string, - tvb,offset,msg_len,FALSE); + tvb,offset,msg_len,ENC_ASCII|ENC_NA); offset+=msg_len; if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG)== DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG){ @@ -1775,10 +1775,10 @@ dissect_network_switch(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,ENC_NA); offset+=1;msg_len-=1; string_len=tvb_strsize(tvb,offset); - proto_tree_add_item(msg_tree,hf_net_full_pathname,tvb,offset,string_len,ENC_NA); + proto_tree_add_item(msg_tree,hf_net_full_pathname,tvb,offset,string_len,ENC_ASCII|ENC_NA); offset+=string_len;msg_len-=string_len; string_len=tvb_strsize(tvb,offset); - proto_tree_add_item(msg_tree,hf_net_file_identifier,tvb,offset,string_len,ENC_NA); + proto_tree_add_item(msg_tree,hf_net_file_identifier,tvb,offset,string_len,ENC_ASCII|ENC_NA); offset+=string_len;msg_len-=string_len; proto_tree_add_item(msg_tree,hf_net_file_server_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; |