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-dvmrp.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-dvmrp.c')
| -rw-r--r-- | epan/dissectors/packet-dvmrp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index ec50351fc3..5ed6a8934a 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -730,7 +730,7 @@ proto_register_dvmrp(void) static hf_register_info hf[] = { { &hf_version, { "DVMRP Version", "dvmrp.version", FT_UINT8, BASE_DEC, - NULL, 0, "DVMRP Version", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_type, { "Type", "dvmrp.type", FT_UINT8, BASE_HEX, @@ -746,7 +746,7 @@ proto_register_dvmrp(void) { &hf_checksum_bad, { "Bad Checksum", "dvmrp.checksum_bad", FT_BOOLEAN, BASE_NONE, - NULL, 0, "Bad DVMRP Checksum", HFILL }}, + NULL, 0x0, "Bad DVMRP Checksum", HFILL }}, { &hf_commands, { "Commands", "dvmrp.commands", FT_NONE, BASE_NONE, @@ -762,7 +762,7 @@ proto_register_dvmrp(void) { &hf_count, { "Count", "dvmrp.count", FT_UINT8, BASE_HEX, - NULL, 0, "Count", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_netmask, { "Netmask", "dvmrp.netmask", FT_IPv4, BASE_NONE, @@ -774,7 +774,7 @@ proto_register_dvmrp(void) {&hf_dest_unr, { "Destination Unreachable", "dvmrp.dest_unreach", FT_BOOLEAN, 8, - TFS(&tfs_dest_unreach), 0x01, "Destination Unreachable", HFILL }}, + TFS(&tfs_dest_unreach), 0x01, NULL, HFILL }}, {&hf_split_horiz, { "Split Horizon", "dvmrp.split_horiz", FT_BOOLEAN, 8, @@ -806,7 +806,7 @@ proto_register_dvmrp(void) {&hf_cap_leaf, { "Leaf", "dvmrp.cap.leaf", FT_BOOLEAN, 8, - TFS(&tfs_cap_leaf), DVMRP_V3_CAP_LEAF, "Leaf", HFILL }}, + TFS(&tfs_cap_leaf), DVMRP_V3_CAP_LEAF, NULL, HFILL }}, {&hf_cap_prune, { "Prune", "dvmrp.cap.prune", FT_BOOLEAN, 8, |