diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
| commit | 126aa8539380e6b0b465b48d30f349b76afdc489 (patch) | |
| tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-fcfcs.c | |
| parent | 4c9bb81ad7b0f609fa236c808a1ab9ef6cab5a79 (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).
svn path=/trunk/; revision=39426
Diffstat (limited to 'epan/dissectors/packet-fcfcs.c')
| -rw-r--r-- | epan/dissectors/packet-fcfcs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 516e883295..78e96b9a9b 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -239,7 +239,7 @@ dissect_fcfcs_gieln (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Name Length: %d", tvb_get_guint8 (tvb, offset)); proto_tree_add_item (tree, hf_fcs_lname, tvb, offset+1, - tvb_get_guint8 (tvb, offset), 0); + tvb_get_guint8 (tvb, offset), ENC_ASCII|ENC_NA); } } } @@ -265,7 +265,7 @@ dissect_fcfcs_gmal (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Name Length: %d", tvb_get_guint8 (tvb, offset)); proto_tree_add_item (tree, hf_fcs_mgmtaddr, tvb, offset+1, - tvb_get_guint8 (tvb, offset), 0); + tvb_get_guint8 (tvb, offset), ENC_ASCII|ENC_NA); offset += 256; } } @@ -291,17 +291,17 @@ dissect_fcfcs_gieil (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) prevlen = 0; len = tvb_strsize(tvb, offset+4); proto_tree_add_item (tree, hf_fcs_vendorname, tvb, offset+4, - len, FALSE); + len, ENC_ASCII|ENC_NA); prevlen += len; len = tvb_strsize(tvb, offset+4+prevlen); proto_tree_add_item (tree, hf_fcs_modelname, tvb, offset+4+prevlen, - len, FALSE); + len, ENC_ASCII|ENC_NA); prevlen += len; len = tvb_strsize(tvb, offset+4+prevlen); proto_tree_add_item (tree, hf_fcs_releasecode, tvb, - offset+4+prevlen, len, FALSE); + offset+4+prevlen, len, ENC_ASCII|ENC_NA); prevlen += len; offset += (4+prevlen); while (tot_len > prevlen) { @@ -504,7 +504,7 @@ dissect_fcfcs_gplml (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) "Mgmt Address Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformaddr, tvb, offset+1, - len, 0); + len, ENC_ASCII|ENC_NA); offset += 256; } } @@ -572,7 +572,7 @@ dissect_fcfcs_rieln (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) len = tvb_get_guint8 (tvb, offset+8); proto_tree_add_text (tree, tvb, offset+8, 1, "Logical Name Length: %d", len); - proto_tree_add_item (tree, hf_fcs_lname, tvb, offset+9, len, 0); + proto_tree_add_item (tree, hf_fcs_lname, tvb, offset+9, len, ENC_ASCII|ENC_NA); } } } @@ -601,7 +601,7 @@ dissect_fcfcs_rpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Mgmt. Addr Length: %d", len); proto_tree_add_item (tree, hf_fcs_mgmtaddr, tvb, offset+1, - len, 0); + len, ENC_ASCII|ENC_NA); offset += 256; } @@ -674,7 +674,7 @@ dissect_fcfcs_rplm (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset+256, 1, "Platform Mgmt. Address Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformaddr, tvb, offset+257, - len, 0); + len, ENC_ASCII|ENC_NA); } } } |