diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-16 10:39:06 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-16 10:39:06 +0000 |
| commit | 346f803d42ac477109e02df2578eb8c86ccf4c4f (patch) | |
| tree | 4277e1e48aeb6d492ceb835af645460070fb04ec /epan/dissectors/packet-spp.c | |
| parent | 58e4750ecbf593fb678c713da398979b7fb2ed5d (diff) | |
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string
There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.
svn path=/trunk/; revision=52098
Diffstat (limited to 'epan/dissectors/packet-spp.c')
| -rw-r--r-- | epan/dissectors/packet-spp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index bdb2ce153f..745c7b1425 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -150,16 +150,14 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { if (datastream_type_string != NULL) { - proto_tree_add_uint_format(spp_tree, hf_spp_datastream_type, tvb, + proto_tree_add_uint_format_value(spp_tree, hf_spp_datastream_type, tvb, 1, 1, datastream_type, - "Datastream Type: %s (0x%02X)", + "%s (0x%02X)", datastream_type_string, datastream_type); } else { - proto_tree_add_uint_format(spp_tree, hf_spp_datastream_type, tvb, - 1, 1, datastream_type, - "Datastream Type: 0x%02X", - datastream_type); + proto_tree_add_uint(spp_tree, hf_spp_datastream_type, tvb, + 1, 1, datastream_type); } proto_tree_add_item(spp_tree, hf_spp_src_id, tvb, 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(spp_tree, hf_spp_dst_id, tvb, 4, 2, ENC_BIG_ENDIAN); @@ -222,7 +220,7 @@ proto_register_spp(void) NULL, HFILL }}, { &hf_spp_datastream_type, - { "Datastream type", "spp.type", + { "Datastream Type", "spp.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, |