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-nbd.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-nbd.c')
| -rw-r--r-- | epan/dissectors/packet-nbd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 5a228b49b6..89fcb1e8b2 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -451,22 +451,22 @@ void proto_register_nbd(void) static hf_register_info hf[] = { { &hf_nbd_magic, { "Magic", "nbd.magic", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nbd_type, { "Type", "nbd.type", FT_UINT32, BASE_DEC, - VALS(nbd_type_vals), 0x0, "", HFILL }}, + VALS(nbd_type_vals), 0x0, NULL, HFILL }}, { &hf_nbd_error, { "Error", "nbd.error", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nbd_len, { "Length", "nbd.len", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nbd_handle, { "Handle", "nbd.handle", FT_UINT64, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nbd_from, { "From", "nbd.from", FT_UINT64, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nbd_response_in, { "Response In", "nbd.response_in", FT_FRAMENUM, BASE_DEC, NULL, 0x0, "The response to this NBD request is in this frame", HFILL }}, @@ -478,8 +478,8 @@ void proto_register_nbd(void) NULL, 0x0, "The time between the Call and the Reply", HFILL }}, { &hf_nbd_data, - { "Data", "nbd.data", FT_BYTES, BASE_HEX, - NULL, 0x0, "", HFILL }}, + { "Data", "nbd.data", FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL }}, }; |