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

1 files changed, 16 insertions, 16 deletions

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index ff30c540e2..6deca1ce5e 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1776,11 +1776,11 @@ void proto_register_acse(void) {
         "acse.T_single_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned,
       { "octet-aligned", "acse.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_octet_aligned", HFILL }},
     { &hf_acse_arbitrary,
       { "arbitrary", "acse.arbitrary",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.BIT_STRING", HFILL }},
     { &hf_acse_aarq,
       { "aarq", "acse.aarq",
@@ -1816,7 +1816,7 @@ void proto_register_acse(void) {
         "acse.ACRP_apdu", HFILL }},
     { &hf_acse_aARQ_protocol_version,
       { "protocol-version", "acse.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_AARQ_protocol_version", HFILL }},
     { &hf_acse_aARQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
@@ -1856,7 +1856,7 @@ void proto_register_acse(void) {
         "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_sender_acse_requirements,
       { "sender-acse-requirements", "acse.sender_acse_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ACSE_requirements", HFILL }},
     { &hf_acse_mechanism_name,
       { "mechanism-name", "acse.mechanism_name",
@@ -1892,7 +1892,7 @@ void proto_register_acse(void) {
         "acse.Association_data", HFILL }},
     { &hf_acse_aARE_protocol_version,
       { "protocol-version", "acse.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_AARE_protocol_version", HFILL }},
     { &hf_acse_aARE_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
@@ -1924,7 +1924,7 @@ void proto_register_acse(void) {
         "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_responder_acse_requirements,
       { "responder-acse-requirements", "acse.responder_acse_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ACSE_requirements", HFILL }},
     { &hf_acse_responding_authentication_value,
       { "responding-authentication-value", "acse.responding_authentication_value",
@@ -2016,7 +2016,7 @@ void proto_register_acse(void) {
         "acse.ASO_qualifier_form3", HFILL }},
     { &hf_acse_aso_qualifier_form_any_octets,
       { "aso-qualifier-form-any-octets", "acse.aso_qualifier_form_any_octets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ASO_qualifier_form_octets", HFILL }},
     { &hf_acse_ae_title_form1,
       { "ae-title-form1", "acse.ae_title_form1",
@@ -2112,7 +2112,7 @@ void proto_register_acse(void) {
         "acse.EXTERNALt", HFILL }},
     { &hf_acse_simply_encoded_data,
       { "simply-encoded-data", "acse.simply_encoded_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.Simply_encoded_data", HFILL }},
     { &hf_acse_fully_encoded_data,
       { "fully-encoded-data", "acse.fully_encoded_data",
@@ -2132,7 +2132,7 @@ void proto_register_acse(void) {
         "acse.T_simple_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned_01,
       { "octet-aligned", "acse.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.OCTET_STRING", HFILL }},
     { &hf_acse_other_mechanism_name,
       { "other-mechanism-name", "acse.other_mechanism_name",
@@ -2148,7 +2148,7 @@ void proto_register_acse(void) {
         "acse.GraphicString", HFILL }},
     { &hf_acse_bitstring,
       { "bitstring", "acse.bitstring",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.BIT_STRING", HFILL }},
     { &hf_acse_external,
       { "external", "acse.external",
@@ -2161,27 +2161,27 @@ void proto_register_acse(void) {
     { &hf_acse_T_AARQ_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_T_AARE_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_authentication,
       { "authentication", "acse.authentication",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_aSO_context_negotiation,
       { "aSO-context-negotiation", "acse.aSO-context-negotiation",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_higher_level_association,
       { "higher-level-association", "acse.higher-level-association",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_nested_association,
       { "nested-association", "acse.nested-association",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-acse-hfarr.c ---*/
 #line 252 "packet-acse-template.c"