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

diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 12b64b877e..6dd7c3d43b 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -2022,7 +2022,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedReadArgument,
       { "signedChainedReadArgument", "dsp.signedChainedReadArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedReadArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedReadArgument,
       { "chainedReadArgument", "dsp.chainedReadArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2050,7 +2050,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedReadResult,
       { "signedChainedReadResult", "dsp.signedChainedReadResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedReadResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedReadResult,
       { "chainedReadResult", "dsp.chainedReadResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2066,7 +2066,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedCompareArgument,
       { "signedChainedCompareArgument", "dsp.signedChainedCompareArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedCompareArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedCompareArgument,
       { "chainedCompareArgument", "dsp.chainedCompareArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2082,7 +2082,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedCompareResult,
       { "signedChainedCompareResult", "dsp.signedChainedCompareResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedCompareResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedCompareResult,
       { "chainedCompareResult", "dsp.chainedCompareResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2098,7 +2098,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedListArgument,
       { "signedChainedListArgument", "dsp.signedChainedListArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedListArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedListArgument,
       { "chainedListArgument", "dsp.chainedListArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2114,7 +2114,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedListResult,
       { "signedChainedListResult", "dsp.signedChainedListResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedListResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedListResult,
       { "chainedListResult", "dsp.chainedListResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2130,7 +2130,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedSearchArgument,
       { "signedChainedSearchArgument", "dsp.signedChainedSearchArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedSearchArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedSearchArgument,
       { "chainedSearchArgument", "dsp.chainedSearchArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2146,7 +2146,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedSearchResult,
       { "signedChainedSearchResult", "dsp.signedChainedSearchResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedSearchResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedSearchResult,
       { "chainedSearchResult", "dsp.chainedSearchResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2162,7 +2162,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedAddEntryArgument,
       { "signedChainedAddEntryArgument", "dsp.signedChainedAddEntryArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedAddEntryArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedAddEntryArgument,
       { "chainedAddEntryArgument", "dsp.chainedAddEntryArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2178,7 +2178,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedAddEntryResult,
       { "signedChainedAddEntryResult", "dsp.signedChainedAddEntryResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedAddEntryResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedAddEntryResult,
       { "chainedAddEntryResult", "dsp.chainedAddEntryResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2194,7 +2194,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedRemoveEntryArgument,
       { "signedChainedRemoveEntryArgument", "dsp.signedChainedRemoveEntryArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedRemoveEntryArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedRemoveEntryArgument,
       { "chainedRemoveEntryArgument", "dsp.chainedRemoveEntryArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2210,7 +2210,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedRemoveEntryResult,
       { "signedChainedRemoveEntryResult", "dsp.signedChainedRemoveEntryResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedRemoveEntryResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedRemoveEntryResult,
       { "chainedRemoveEntryResult", "dsp.chainedRemoveEntryResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2226,7 +2226,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedModifyEntryArgument,
       { "signedChainedModifyEntryArgument", "dsp.signedChainedModifyEntryArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedModifyEntryArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedModifyEntryArgument,
       { "chainedModifyEntryArgument", "dsp.chainedModifyEntryArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2242,7 +2242,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedModifyEntryResult,
       { "signedChainedModifyEntryResult", "dsp.signedChainedModifyEntryResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedModifyEntryResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedModifyEntryResult,
       { "chainedModifyEntryResult", "dsp.chainedModifyEntryResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2258,7 +2258,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedModifyDNArgument,
       { "signedChainedModifyDNArgument", "dsp.signedChainedModifyDNArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedModifyDNArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedModifyDNArgument,
       { "chainedModifyDNArgument", "dsp.chainedModifyDNArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2274,7 +2274,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedChainedModifyDNResult,
       { "signedChainedModifyDNResult", "dsp.signedChainedModifyDNResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedChainedModifyDNResult", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_chainedModifyDNResult,
       { "chainedModifyDNResult", "dsp.chainedModifyDNResult",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2314,7 +2314,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_signedDSAReferral,
       { "signedDSAReferral", "dsp.signedDSAReferral",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedDSAReferral", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_dsaReferral,
       { "dsaReferral", "dsp.dsaReferral",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2402,7 +2402,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_nonDapPdu,
       { "nonDapPdu", "dsp.nonDapPdu",
         FT_UINT32, BASE_DEC, VALS(dsp_T_nonDapPdu_vals), 0,
-        "T_nonDapPdu", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_streamedResults,
       { "streamedResults", "dsp.streamedResults",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -2438,7 +2438,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_nameResolutionPhase,
       { "nameResolutionPhase", "dsp.nameResolutionPhase",
         FT_UINT32, BASE_DEC, VALS(dsp_T_nameResolutionPhase_vals), 0,
-        "T_nameResolutionPhase", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_nextRDNToBeResolved,
       { "nextRDNToBeResolved", "dsp.nextRDNToBeResolved",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -2490,7 +2490,7 @@ void proto_register_dsp(void) {
     { &hf_dsp_category,
       { "category", "dsp.category",
         FT_UINT32, BASE_DEC, VALS(dsp_T_category_vals), 0,
-        "T_category", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_additionalPoints,
       { "additionalPoints", "dsp.additionalPoints",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2526,11 +2526,11 @@ void proto_register_dsp(void) {
     { &hf_dsp_basicLevels,
       { "basicLevels", "dsp.basicLevels",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_basicLevels", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_level,
       { "level", "dsp.level",
         FT_UINT32, BASE_DEC, VALS(dsp_T_level_vals), 0,
-        "T_level", HFILL }},
+        NULL, HFILL }},
     { &hf_dsp_localQualifier,
       { "localQualifier", "dsp.localQualifier",
         FT_INT32, BASE_DEC, NULL, 0,