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

diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index bc7ce84fd4..530fcc7bef 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -956,7 +956,7 @@ void proto_register_x509af(void) {
     { &hf_x509af_signedCertificate,
       { "signedCertificate", "x509af.signedCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedCertificate", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_version,
       { "version", "x509af.version",
         FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
@@ -1012,11 +1012,11 @@ void proto_register_x509af(void) {
     { &hf_x509af_algorithmId,
       { "algorithmId", "x509af.algorithmId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_algorithmId", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_parameters,
       { "parameters", "x509af.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_parameters", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_notBefore,
       { "notBefore", "x509af.notBefore",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
@@ -1048,7 +1048,7 @@ void proto_register_x509af(void) {
     { &hf_x509af_extnId,
       { "extnId", "x509af.extnId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_extnId", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_critical,
       { "critical", "x509af.critical",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -1056,7 +1056,7 @@ void proto_register_x509af(void) {
     { &hf_x509af_extnValue,
       { "extnValue", "x509af.extnValue",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_extnValue", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_userCertificate,
       { "userCertificate", "x509af.userCertificate",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1092,7 +1092,7 @@ void proto_register_x509af(void) {
     { &hf_x509af_signedCertificateList,
       { "signedCertificateList", "x509af.signedCertificateList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedCertificateList", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_thisUpdate,
       { "thisUpdate", "x509af.thisUpdate",
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
@@ -1104,11 +1104,11 @@ void proto_register_x509af(void) {
     { &hf_x509af_revokedCertificates,
       { "revokedCertificates", "x509af.revokedCertificates",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_revokedCertificates", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_revokedCertificates_item,
       { "revokedCertificates item", "x509af.revokedCertificates_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_revokedCertificates_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_revokedUserCertificate,
       { "userCertificate", "x509af.userCertificate",
         FT_INT32, BASE_DEC, NULL, 0,