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-dcom-oxid.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-dcom-oxid.c')
| -rw-r--r-- | epan/dissectors/packet-dcom-oxid.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index 4929454fa7..a8c2119de4 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -301,41 +301,41 @@ proto_register_oxid (void) { static hf_register_info hf[] = { { &hf_oxid_opnum, - { "Operation", "oxid.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Operation", "oxid.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_setid, - { "SetId", "oxid_setid", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SetId", "oxid_setid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_seqnum, - { "SeqNum", "oxid_seqnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SeqNum", "oxid_seqnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_addtoset, - { "AddToSet", "oxid_addtoset", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "AddToSet", "oxid_addtoset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_delfromset, - { "DelFromSet", "oxid_delfromset", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "DelFromSet", "oxid_delfromset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_oid, - { "OID", "oxid_oid", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "OID", "oxid_oid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_ping_backoff_factor, - { "PingBackoffFactor", "oxid_ping_backoff_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PingBackoffFactor", "oxid_ping_backoff_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_oxid, - { "OXID", "oxid_oxid", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "OXID", "oxid_oxid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_requested_protseqs, - { "RequestedProtSeq", "oxid_requested_protseqs", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "RequestedProtSeq", "oxid_requested_protseqs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_protseqs, - { "ProtSeq", "oxid_protseqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, "", HFILL }}, + { "ProtSeq", "oxid_protseqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }}, { &hf_oxid_bindings, - { "OxidBindings", "oxid_bindings", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "OxidBindings", "oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_ipid, - { "IPID", "oxid_ipid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IPID", "oxid_ipid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_authn_hint, - { "AuthnHint", "oxid_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "AuthnHint", "oxid_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_ds_array, - { "Address", "dcom.oxid.address", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Address", "dcom.oxid.address", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_Unknown1, - { "unknown 8 bytes 1", "oxid5.unknown1", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "unknown 8 bytes 1", "oxid5.unknown1", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_oxid_Unknown2, - { "unknown 8 bytes 2", "oxid5.unknown2", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }} + { "unknown 8 bytes 2", "oxid5.unknown2", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }} }; static gint *ett[] = { &ett_oxid |