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

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index e893588dcb..bf2db717f1 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1917,7 +1917,7 @@ void proto_register_cms(void) {
     { &hf_cms_content,
       { "content", "cms.content",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_content", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_version,
       { "version", "cms.version",
         FT_INT32, BASE_DEC, VALS(cms_CMSVersion_vals), 0,
@@ -1957,7 +1957,7 @@ void proto_register_cms(void) {
     { &hf_cms_eContent,
       { "eContent", "cms.eContent",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_eContent", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_sid,
       { "sid", "cms.sid",
         FT_UINT32, BASE_DEC, VALS(cms_SignerIdentifier_vals), 0,
@@ -2001,7 +2001,7 @@ void proto_register_cms(void) {
     { &hf_cms_attrType,
       { "attrType", "cms.attrType",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_attrType", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_attrValues,
       { "attrValues", "cms.attrValues",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2141,11 +2141,11 @@ void proto_register_cms(void) {
     { &hf_cms_oriType,
       { "oriType", "cms.oriType",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_oriType", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_oriValue,
       { "oriValue", "cms.oriValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_oriValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_digest,
       { "digest", "cms.digest",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -2189,11 +2189,11 @@ void proto_register_cms(void) {
     { &hf_cms_otherRevInfoFormat,
       { "otherRevInfoFormat", "cms.otherRevInfoFormat",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_otherRevInfoFormat", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_otherRevInfo,
       { "otherRevInfo", "cms.otherRevInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_otherRevInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_certificate,
       { "certificate", "cms.certificate",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2225,11 +2225,11 @@ void proto_register_cms(void) {
     { &hf_cms_keyAttrId,
       { "keyAttrId", "cms.keyAttrId",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_keyAttrId", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_keyAttr,
       { "keyAttr", "cms.keyAttr",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_keyAttr", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_utcTime,
       { "utcTime", "cms.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -2265,11 +2265,11 @@ void proto_register_cms(void) {
     { &hf_cms_capability,
       { "capability", "cms.capability",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_capability", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_parameters,
       { "parameters", "cms.parameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_parameters", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_recipientKeyId,
       { "recipientKeyId", "cms.recipientKeyId",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2305,7 +2305,7 @@ void proto_register_cms(void) {
     { &hf_cms_subject,
       { "subject", "cms.subject",
         FT_UINT32, BASE_DEC, VALS(cms_T_subject_vals), 0,
-        "T_subject", HFILL }},
+        NULL, HFILL }},
     { &hf_cms_baseCertificateID,
       { "baseCertificateID", "cms.baseCertificateID",
         FT_NONE, BASE_NONE, NULL, 0,