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-dcerpc-conv.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-dcerpc-conv.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-conv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index abe7d11518..5ab2272ad5 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.c @@ -176,23 +176,23 @@ proto_register_conv (void) { static hf_register_info hf[] = { { &hf_conv_opnum, - { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}, + { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_conv_rc, - {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, "", HFILL }}, + {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, NULL, HFILL }}, { &hf_conv_who_are_you_rqst_actuid, {"Activity UID", "conv.who_are_you_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, { &hf_conv_who_are_you_rqst_boot_time, - {"Boot time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }}, + {"Boot time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you2_rqst_actuid, {"Activity UID", "conv.who_are_you2_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, { &hf_conv_who_are_you2_rqst_boot_time, - {"Boot time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }}, + {"Boot time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you_resp_seq, - {"Sequence Number", "conv.who_are_you_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + {"Sequence Number", "conv.who_are_you_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you2_resp_seq, - {"Sequence Number", "conv.who_are_you2_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + {"Sequence Number", "conv.who_are_you2_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you2_resp_casuuid, {"Client's address space UUID", "conv.who_are_you2_resp_casuuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }} }; |