diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-iec104.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-iec104.c')
| -rw-r--r-- | epan/dissectors/packet-iec104.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 5d5a1f3808..b53bac1358 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -693,11 +693,11 @@ proto_register_iec104asdu(void) "Common Address of Asdu", HFILL }}, { &hf_oa, - { "OA ", "104asdu.oa", FT_UINT8, BASE_DEC, NULL, 0x0, + { "OA", "104asdu.oa", FT_UINT8, BASE_DEC, NULL, 0x0, "Originator Address", HFILL }}, { &hf_typeid, - { "TypeId ", "104asdu.typeid", FT_UINT8, BASE_DEC, VALS(asdu_types), 0x0, + { "TypeId", "104asdu.typeid", FT_UINT8, BASE_DEC, VALS(asdu_types), 0x0, "Asdu Type Id", HFILL }}, { &hf_causetx, @@ -706,15 +706,15 @@ proto_register_iec104asdu(void) { &hf_nega, { "Negative", "104asdu.nega", FT_BOOLEAN, 8, NULL, F_NEGA, - "Negative", HFILL }}, + NULL, HFILL }}, { &hf_test, { "Test", "104asdu.test", FT_BOOLEAN, 8, NULL, F_TEST, - "Test", HFILL }}, + NULL, HFILL }}, { &hf_ioa, - { "IOA ", "104asdu.ioa", FT_UINT24, BASE_DEC, NULL, 0x0, + { "IOA", "104asdu.ioa", FT_UINT24, BASE_DEC, NULL, 0x0, "Information Object Address", HFILL }}, { &hf_numix, |