diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
| commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-tr.c | |
| parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-tr.c')
| -rw-r--r-- | epan/dissectors/packet-tr.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 44628ee6af..da231037f2 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -644,35 +644,35 @@ proto_register_tr(void) static hf_register_info hf[] = { { &hf_tr_ac, { "Access Control", "tr.ac", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_priority, { "Priority", "tr.priority", FT_UINT8, BASE_DEC, NULL, 0xe0, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_frame, { "Frame", "tr.frame", FT_BOOLEAN, 8, TFS(&ac_truth), 0x10, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_monitor_cnt, { "Monitor Count", "tr.monitor_cnt", FT_UINT8, BASE_DEC, NULL, 0x08, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_priority_reservation, { "Priority Reservation","tr.priority_reservation", FT_UINT8, BASE_DEC, NULL, 0x07, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_fc, { "Frame Control", "tr.fc", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_fc_type, { "Frame Type", "tr.frame_type", FT_UINT8, BASE_DEC, VALS(frame_vals), 0xc0, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_fc_pcf, { "Frame PCF", "tr.frame_pcf", FT_UINT8, BASE_DEC, VALS(pcf_vals), 0x0f, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_dst, { "Destination", "tr.dst", FT_ETHER, BASE_NONE, NULL, 0x0, @@ -688,12 +688,11 @@ proto_register_tr(void) { &hf_tr_sr, { "Source Routed", "tr.sr", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "Source Routed", HFILL }}, + NULL, HFILL }}, { &hf_tr_rif_bytes, { "RIF Bytes", "tr.rif_bytes", FT_UINT8, BASE_DEC, NULL, 0x0, - "Number of bytes in Routing Information Fields, including " - "the two bytes of Routing Control Field", HFILL }}, + "Number of bytes in Routing Information Fields, including the two bytes of Routing Control Field", HFILL }}, { &hf_tr_broadcast, { "Broadcast Type", "tr.broadcast", FT_UINT8, BASE_DEC, VALS(broadcast_vals), 0x0, @@ -702,7 +701,7 @@ proto_register_tr(void) { &hf_tr_max_frame_size, { "Maximum Frame Size", "tr.max_frame_size", FT_UINT8, BASE_DEC, VALS(max_frame_size_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_direction, { "Direction", "tr.direction", FT_UINT8, BASE_DEC, VALS(direction_vals), 0x0, @@ -714,11 +713,11 @@ proto_register_tr(void) { &hf_tr_rif_ring, { "RIF Ring", "tr.rif.ring", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_tr_rif_bridge, { "RIF Bridge", "tr.rif.bridge", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, }; static gint *ett[] = { &ett_token_ring, |