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.

svn path=/trunk/; revision=32748

1 files changed, 34 insertions, 34 deletions

diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 98c3db72c3..75f96454f1 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -2147,19 +2147,19 @@ void proto_register_x509if(void) {
     { &hf_x509if_type,
       { "type", "x509if.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_type", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_values,
       { "values", "x509if.values",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_values", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_values_item,
       { "values item", "x509if.values_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_values_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_valuesWithContext,
       { "valuesWithContext", "x509if.valuesWithContext",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_valuesWithContext", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_valuesWithContext_item,
       { "valuesWithContext item", "x509if.valuesWithContext_item",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2167,7 +2167,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_value,
       { "value", "x509if.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_value", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_contextList,
       { "contextList", "x509if.contextList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2179,15 +2179,15 @@ void proto_register_x509if(void) {
     { &hf_x509if_contextType,
       { "contextType", "x509if.contextType",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_contextType", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_contextValues,
       { "contextValues", "x509if.contextValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_contextValues", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_contextValues_item,
       { "contextValues item", "x509if.contextValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_contextValues_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_fallback,
       { "fallback", "x509if.fallback",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -2199,15 +2199,15 @@ void proto_register_x509if(void) {
     { &hf_x509if_assertion,
       { "assertion", "x509if.assertion",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_assertion", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_assertedContexts,
       { "assertedContexts", "x509if.assertedContexts",
         FT_UINT32, BASE_DEC, VALS(x509if_T_assertedContexts_vals), 0,
-        "T_assertedContexts", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_allContexts,
       { "allContexts", "x509if.allContexts",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_selectedContexts,
       { "selectedContexts", "x509if.selectedContexts",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2247,11 +2247,11 @@ void proto_register_x509if(void) {
     { &hf_x509if_RDNSequence_item,
       { "RDNSequence item", "x509if.RDNSequence_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "RDNSequence_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_RelativeDistinguishedName_item,
       { "RelativeDistinguishedName item", "x509if.RelativeDistinguishedName_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RelativeDistinguishedName_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_type_03,
       { "type", "x509if.type",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2275,7 +2275,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_distingAttrValue,
       { "distingAttrValue", "x509if.distingAttrValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_distingAttrValue", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_chopSpecificExclusions,
       { "specificExclusions", "x509if.specificExclusions",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2347,7 +2347,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_auxiliaries,
       { "auxiliaries", "x509if.auxiliaries",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_auxiliaries", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_auxiliaries_item,
       { "auxiliaries item", "x509if.auxiliaries_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2355,7 +2355,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_mandatory,
       { "mandatory", "x509if.mandatory",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_mandatory", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_mandatory_item,
       { "mandatory item", "x509if.mandatory_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2363,7 +2363,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_optional,
       { "optional", "x509if.optional",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_optional", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_optional_item,
       { "optional item", "x509if.optional_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2371,7 +2371,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_precluded,
       { "precluded", "x509if.precluded",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_precluded", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_precluded_item,
       { "precluded item", "x509if.precluded_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2383,7 +2383,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_mandatoryContexts,
       { "mandatoryContexts", "x509if.mandatoryContexts",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_mandatoryContexts", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_mandatoryContexts_item,
       { "mandatoryContexts item", "x509if.mandatoryContexts_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2391,7 +2391,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_optionalContexts,
       { "optionalContexts", "x509if.optionalContexts",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_optionalContexts", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_optionalContexts_item,
       { "optionalContexts item", "x509if.optionalContexts_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2407,7 +2407,7 @@ void proto_register_x509if(void) {
     { &hf_x509if_attributeType_01,
       { "attributeType", "x509if.attributeType",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_attributeType", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_includeSubtypes,
       { "includeSubtypes", "x509if.includeSubtypes",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -2423,15 +2423,15 @@ void proto_register_x509if(void) {
     { &hf_x509if_defaultValues,
       { "defaultValues", "x509if.defaultValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_defaultValues", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_defaultValues_item,
       { "defaultValues item", "x509if.defaultValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_defaultValues_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_entryType,
       { "entryType", "x509if.entryType",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_entryType", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_ra_values,
       { "values", "x509if.values",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2467,11 +2467,11 @@ void proto_register_x509if(void) {
     { &hf_x509if_contextValue,
       { "contextValue", "x509if.contextValue",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_contextValue", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_contextValue_item,
       { "contextValue item", "x509if.contextValue_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_contextValue_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_context,
       { "context", "x509if.context",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2499,11 +2499,11 @@ void proto_register_x509if(void) {
     { &hf_x509if_restrictionType,
       { "restrictionType", "x509if.restrictionType",
         FT_OID, BASE_NONE, NULL, 0,
-        "T_restrictionType", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_restrictionValue,
       { "restrictionValue", "x509if.restrictionValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_restrictionValue", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_attribute,
       { "attribute", "x509if.attribute",
         FT_OID, BASE_NONE, NULL, 0,
@@ -2535,19 +2535,19 @@ void proto_register_x509if(void) {
     { &hf_x509if_outputValues,
       { "outputValues", "x509if.outputValues",
         FT_UINT32, BASE_DEC, VALS(x509if_T_outputValues_vals), 0,
-        "T_outputValues", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_selectedValues,
       { "selectedValues", "x509if.selectedValues",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_selectedValues", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_selectedValues_item,
       { "selectedValues item", "x509if.selectedValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_selectedValues_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_matchedValuesOnly,
       { "matchedValuesOnly", "x509if.matchedValuesOnly",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_contexts_01,
       { "contexts", "x509if.contexts",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2639,11 +2639,11 @@ void proto_register_x509if(void) {
     { &hf_x509if_specificExclusions,
       { "specificExclusions", "x509if.specificExclusions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_specificExclusions", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_specificExclusions_item,
       { "specificExclusions item", "x509if.specificExclusions_item",
         FT_UINT32, BASE_DEC, VALS(x509if_T_specificExclusions_item_vals), 0,
-        "T_specificExclusions_item", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_specificationFilter,
       { "specificationFilter", "x509if.specificationFilter",
         FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,