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-dispatch.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-dispatch.c')
| -rw-r--r-- | epan/dissectors/packet-dcom-dispatch.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 3c46f29edc..8648bae6ee 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -547,74 +547,74 @@ proto_register_dcom_dispatch(void) static hf_register_info hf_dispatch_array[] = { { &hf_dispatch_opnum, - { "Operation", "dispatch_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}, + { "Operation", "dispatch_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_riid, - { "RIID", "dispatch_riid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "RIID", "dispatch_riid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_name, - { "Name", "hf_dispatch_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Name", "hf_dispatch_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_names, - { "Names", "dispatch_names", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Names", "dispatch_names", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_lcid, - { "LCID", "dispatch_lcid", FT_UINT32, BASE_HEX, VALS(dcom_lcid_vals), 0x0, "", HFILL }}, + { "LCID", "dispatch_lcid", FT_UINT32, BASE_HEX, VALS(dcom_lcid_vals), 0x0, NULL, HFILL }}, { &hf_dispatch_id, - { "DispID", "dispatch_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DispID", "dispatch_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_flags, - { "Flags", "dispatch_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Flags", "dispatch_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_arg, - { "Argument", "dispatch_arg", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Argument", "dispatch_arg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_args, - { "Args", "dispatch_args", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Args", "dispatch_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_named_args, - { "NamedArgs", "dispatch_named_args", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NamedArgs", "dispatch_named_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_varref, - { "VarRef", "dispatch_varref", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "VarRef", "dispatch_varref", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_varrefidx, - { "VarRefIdx", "dispatch_varrefidx", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "VarRefIdx", "dispatch_varrefidx", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_varrefarg, - { "VarRef", "dispatch_varrefarg", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "VarRef", "dispatch_varrefarg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_varresult, - { "VarResult", "dispatch_varresult", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "VarResult", "dispatch_varresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_flags_method, - { "Method", "dispatch_flags_method", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_METHOD, "", HFILL }}, + { "Method", "dispatch_flags_method", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_METHOD, NULL, HFILL }}, { &hf_dispatch_flags_propget, - { "PropertyGet", "dispatch_flags_propget", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPGET, "", HFILL }}, + { "PropertyGet", "dispatch_flags_propget", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPGET, NULL, HFILL }}, { &hf_dispatch_flags_propput, - { "PropertyPut", "dispatch_flags_propput", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUT, "", HFILL }}, + { "PropertyPut", "dispatch_flags_propput", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUT, NULL, HFILL }}, { &hf_dispatch_flags_propputref, - { "PropertyPutRef", "dispatch_flags_propputref", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUTREF, "", HFILL }}, + { "PropertyPutRef", "dispatch_flags_propputref", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUTREF, NULL, HFILL }}, { &hf_dispatch_code, - { "Code", "dispatch_code", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Code", "dispatch_code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_reserved16, - { "Reserved", "dispatch_reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Reserved", "dispatch_reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_source, - { "Source", "dispatch_source", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Source", "dispatch_source", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_description, - { "Description", "dispatch_description", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Description", "dispatch_description", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_help_file, - { "HelpFile", "dispatch_help_file", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "HelpFile", "dispatch_help_file", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_help_context, - { "HelpContext", "dispatch_help_context", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "HelpContext", "dispatch_help_context", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_reserved32, - { "Reserved", "dispatch_reserved32", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Reserved", "dispatch_reserved32", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_deferred_fill_in, - { "DeferredFillIn", "dispatch_deferred_fill_in", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DeferredFillIn", "dispatch_deferred_fill_in", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_arg_err, - { "ArgErr", "dispatch_arg_err", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ArgErr", "dispatch_arg_err", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_tinfo, - { "TInfo", "dispatch_tinfo", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TInfo", "dispatch_tinfo", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_itinfo, - { "TInfo", "dispatch_itinfo", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "TInfo", "dispatch_itinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_dispparams, - { "DispParams", "dispatch_dispparams", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "DispParams", "dispatch_dispparams", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_excepinfo, - { "ExcepInfo", "dispatch_excepinfo", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ExcepInfo", "dispatch_excepinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dispatch_scode, - { "SCode", "dispatch_scode", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, "", HFILL }} + { "SCode", "dispatch_scode", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, NULL, HFILL }} }; static gint *ett[] = { |