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-cpfi.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-cpfi.c')
-rw-r--r-- | epan/dissectors/packet-cpfi.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 9f7ae45a97..49cd7584a0 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -401,11 +401,11 @@ proto_register_cpfi(void) { &hf_cpfi_word_one, { "Word one", "cpfi.word_one", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_cpfi_word_two, { "Word two", "cfpi.word_two", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_cpfi_frame_type, { "FrmType", "cpfi.frmtype", @@ -439,7 +439,7 @@ proto_register_cpfi(void) { &hf_cpfi_CRC_32, { "CRC-32", "cpfi.crc-32", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL}}, + NULL, HFILL}}, { &hf_cpfi_EOF_type, { "EOFtype", "cpfi.EOFtype", @@ -448,48 +448,48 @@ proto_register_cpfi(void) { &hf_cpfi_t_instance, { "Instance", "cpfi.instance", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_src_instance, { "Source Instance", "cpfi.src_instance", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_dst_instance, { "Destination Instance", "cpfi.dst_instance", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_board, { "Board", "cpfi.board", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_src_board, { "Source Board", "cpfi.src_board", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_dst_board, { "Destination Board", "cpfi.dst_board", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_port, { "Port", "cpfi.port", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_src_port, { "Source Port", "cpfi.src_port", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, { &hf_cpfi_t_dst_port, { "Destination Port", "cpfi.dst_port", - FT_BYTES, BASE_DEC, - NULL, 0x0, "", HFILL}}, + FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL}}, }; |