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-lapb.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-lapb.c')
| -rw-r--r-- | epan/dissectors/packet-lapb.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index e6ecc0e68f..860eba23b2 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -128,15 +128,10 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - if (tree) { ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, 2, "LAPB"); lapb_tree = proto_item_add_subtree(ti, ett_lapb); - proto_tree_add_uint_format(lapb_tree, hf_lapb_address, tvb, 0, 1, byte0, - "Address: 0x%02X", byte0); - } - else - lapb_tree = NULL; + proto_tree_add_uint(lapb_tree, hf_lapb_address, tvb, 0, 1, byte0); control = dissect_xdlc_control(tvb, 1, pinfo, lapb_tree, hf_lapb_control, ett_lapb_control, &lapb_cf_items, NULL, NULL, NULL, @@ -164,8 +159,8 @@ proto_register_lapb(void) { static hf_register_info hf[] = { { &hf_lapb_address, - { "Address Field", "lapb.address", FT_UINT8, BASE_HEX, NULL, 0x0, - "Address", HFILL }}, + { "Address", "lapb.address", FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL }}, { &hf_lapb_control, { "Control Field", "lapb.control", FT_UINT8, BASE_HEX, NULL, 0x0, |