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-usb-masstorage.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-usb-masstorage.c')
| -rw-r--r-- | epan/dissectors/packet-usb-masstorage.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 6685b62aa0..6e0ecd251b 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -374,59 +374,59 @@ proto_register_usb_ms(void) static hf_register_info hf[] = { { &hf_usb_ms_dCBWSignature, { "Signature", "usbms.dCBWSignature", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_usb_ms_dCBWTag, { "Tag", "usbms.dCBWTag", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_usb_ms_dCBWDataTransferLength, { "DataTransferLength", "usbms.dCBWDataTransferLength", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_usb_ms_dCBWFlags, { "Flags", "usbms.dCBWFlags", FT_UINT8, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_usb_ms_dCBWLUN, { "LUN", "usbms.dCBWLUN", FT_UINT8, BASE_HEX, - NULL, 0x0f, "", HFILL }}, + NULL, 0x0f, NULL, HFILL }}, { &hf_usb_ms_dCBWCBLength, { "CDB Length", "usbms.dCBWCBLength", FT_UINT8, BASE_HEX, - NULL, 0x1f, "", HFILL }}, + NULL, 0x1f, NULL, HFILL }}, { &hf_usb_ms_dCSWSignature, { "Signature", "usbms.dCSWSignature", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_usb_ms_dCSWDataResidue, { "DataResidue", "usbms.dCSWDataResidue", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_usb_ms_dCSWStatus, { "Status", "usbms.dCSWStatus", FT_UINT8, BASE_HEX, - VALS(status_vals), 0x0, "", HFILL }}, + VALS(status_vals), 0x0, NULL, HFILL }}, { &hf_usb_ms_request, { "bRequest", "usbms.setup.bRequest", FT_UINT8, BASE_HEX, VALS(setup_request_names_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_usb_ms_value, { "wValue", "usbms.setup.wValue", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_usb_ms_index, { "wIndex", "usbms.setup.wIndex", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_usb_ms_length, { "wLength", "usbms.setup.wLength", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_usb_ms_maxlun, { "Max LUN", "usbms.setup.maxlun", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, }; |