Add a little more code to avoid not-very-useful blurbs:

  - Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32748 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 6 insertions, 6 deletions

diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 950a53dd82..df687db0d5 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -2048,15 +2048,15 @@ void proto_register_x509ce(void) {
     { &hf_x509ce_policyQualifierId,
       { "policyQualifierId", "x509ce.policyQualifierId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_policyQualifierId", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_qualifier,
       { "qualifier", "x509ce.qualifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_qualifier", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_PolicyMappingsSyntax_item,
       { "PolicyMappingsSyntax item", "x509ce.PolicyMappingsSyntax_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PolicyMappingsSyntax_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_issuerDomainPolicy,
       { "issuerDomainPolicy", "x509ce.issuerDomainPolicy",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2096,11 +2096,11 @@ void proto_register_x509ce(void) {
     { &hf_x509ce_uniformResourceIdentifier,
       { "uniformResourceIdentifier", "x509ce.uniformResourceIdentifier",
         FT_STRING, BASE_NONE, NULL, 0,
-        "T_uniformResourceIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_iPAddress,
       { "iPAddress", "x509ce.iPAddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_iPAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_registeredID,
       { "registeredID", "x509ce.registeredID",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2424,7 +2424,7 @@ void proto_register_x509ce(void) {
     { &hf_x509ce_builtinNameForm,
       { "builtinNameForm", "x509ce.builtinNameForm",
         FT_UINT32, BASE_DEC, VALS(x509ce_T_builtinNameForm_vals), 0,
-        "T_builtinNameForm", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_otherNameForm,
       { "otherNameForm", "x509ce.otherNameForm",
         FT_OID, BASE_NONE, NULL, 0,