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, 10 insertions, 10 deletions

diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 394cf3986a..a719e7c8c8 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -1977,7 +1977,7 @@ void proto_register_dsp(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dsp_encrypted,
       { "encrypted", "dsp.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dsp.BIT_STRING", HFILL }},
     { &hf_dsp_chainedResults,
       { "chainedResults", "dsp.chainedResults",
@@ -2241,7 +2241,7 @@ void proto_register_dsp(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_dsp_aliasDereferenced,
       { "aliasDereferenced", "dsp.aliasDereferenced",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_notification,
       { "notification", "dsp.notification",
@@ -2285,7 +2285,7 @@ void proto_register_dsp(void) {
         "dsp.INTEGER", HFILL }},
     { &hf_dsp_returnCrossRefs,
       { "returnCrossRefs", "dsp.returnCrossRefs",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_referenceType,
       { "referenceType", "dsp.referenceType",
@@ -2301,11 +2301,11 @@ void proto_register_dsp(void) {
         "dsp.Time", HFILL }},
     { &hf_dsp_entryOnly,
       { "entryOnly", "dsp.entryOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_uniqueIdentifier,
       { "uniqueIdentifier", "dsp.uniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_dsp_authenticationLevel,
       { "authenticationLevel", "dsp.authenticationLevel",
@@ -2317,11 +2317,11 @@ void proto_register_dsp(void) {
         "dsp.Exclusions", HFILL }},
     { &hf_dsp_excludeShadows,
       { "excludeShadows", "dsp.excludeShadows",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_nameResolveOnMaster,
       { "nameResolveOnMaster", "dsp.nameResolveOnMaster",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_operationIdentifier,
       { "operationIdentifier", "dsp.operationIdentifier",
@@ -2405,7 +2405,7 @@ void proto_register_dsp(void) {
         "dsp.APCategory", HFILL }},
     { &hf_dsp_chainingRequired,
       { "chainingRequired", "dsp.chainingRequired",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_MasterAndShadowAccessPoints_item,
       { "MasterOrShadowAccessPoint", "dsp.MasterOrShadowAccessPoint",
@@ -2437,7 +2437,7 @@ void proto_register_dsp(void) {
         "dsp.AccessPointInformation", HFILL }},
     { &hf_dsp_returnToDUA,
       { "returnToDUA", "dsp.returnToDUA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_basicLevels,
       { "basicLevels", "dsp.basicLevels",
@@ -2453,7 +2453,7 @@ void proto_register_dsp(void) {
         "dsp.INTEGER", HFILL }},
     { &hf_dsp_signed,
       { "signed", "dsp.signed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_other,
       { "other", "dsp.other",