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-ansi_tcap.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
download | wireshark-b228488bc0b9d5e0c63b15814836f7332f35ce04.tar.gz |
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-ansi_tcap.c')
-rw-r--r-- | epan/dissectors/packet-ansi_tcap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 2ea6b427d0..f3d6816c33 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1398,7 +1398,7 @@ proto_register_ansi_tcap(void) { "Session Id", "ansi_tcap.srt.session_id", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ansi_tcapsrt_BeginSession, { "Begin Session", @@ -1422,7 +1422,7 @@ proto_register_ansi_tcap(void) { "Request Duplicate", "ansi_tcap.srt.duplicate", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, /*--- Included file: packet-ansi_tcap-hfarr.c ---*/ @@ -1473,7 +1473,7 @@ proto_register_ansi_tcap(void) "ansi_tcap.T_abort", HFILL }}, { &hf_ansi_tcap_identifier, { "identifier", "ansi_tcap.identifier", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.TransactionID", HFILL }}, { &hf_ansi_tcap_dialoguePortion, { "dialoguePortion", "ansi_tcap.dialoguePortion", @@ -1501,7 +1501,7 @@ proto_register_ansi_tcap(void) "ansi_tcap.UserAbortInformation", HFILL }}, { &hf_ansi_tcap_version, { "version", "ansi_tcap.version", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.ProtocolVersion", HFILL }}, { &hf_ansi_tcap_applicationContext, { "applicationContext", "ansi_tcap.applicationContext", @@ -1581,7 +1581,7 @@ proto_register_ansi_tcap(void) "ansi_tcap.ReturnResult", HFILL }}, { &hf_ansi_tcap_componentIDs, { "componentIDs", "ansi_tcap.componentIDs", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.T_componentIDs", HFILL }}, { &hf_ansi_tcap_operationCode, { "operationCode", "ansi_tcap.operationCode", @@ -1589,19 +1589,19 @@ proto_register_ansi_tcap(void) "ansi_tcap.OperationCode", HFILL }}, { &hf_ansi_tcap_parameter, { "parameter", "ansi_tcap.parameter", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.T_parameter", HFILL }}, { &hf_ansi_tcap_componentID, { "componentID", "ansi_tcap.componentID", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.T_componentID", HFILL }}, { &hf_ansi_tcap_parameter_01, { "parameter", "ansi_tcap.parameter", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.T_parameter_01", HFILL }}, { &hf_ansi_tcap_componentID_01, { "componentID", "ansi_tcap.componentID", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.T_componentID_01", HFILL }}, { &hf_ansi_tcap_errorCode, { "errorCode", "ansi_tcap.errorCode", @@ -1609,11 +1609,11 @@ proto_register_ansi_tcap(void) "ansi_tcap.ErrorCode", HFILL }}, { &hf_ansi_tcap_parameter_02, { "parameter", "ansi_tcap.parameter", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.T_parameter_02", HFILL }}, { &hf_ansi_tcap_componentID_02, { "componentID", "ansi_tcap.componentID", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ansi_tcap.OCTET_STRING_SIZE_0_1", HFILL }}, { &hf_ansi_tcap_rejectProblem, { "rejectProblem", "ansi_tcap.rejectProblem", |