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

diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 7eba591241..e95fc97018 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -1688,15 +1688,15 @@ void proto_register_disp(void) {
     { &hf_disp_supplyContexts,
       { "supplyContexts", "disp.supplyContexts",
         FT_UINT32, BASE_DEC, VALS(disp_T_supplyContexts_vals), 0,
-        "T_supplyContexts", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_allContexts,
       { "allContexts", "disp.allContexts",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_selectedContexts,
       { "selectedContexts", "disp.selectedContexts",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_selectedContexts", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_selectedContexts_item,
       { "selectedContexts item", "disp.selectedContexts_item",
         FT_OID, BASE_NONE, NULL, 0,
@@ -1712,7 +1712,7 @@ void proto_register_disp(void) {
     { &hf_disp_knowledgeType,
       { "knowledgeType", "disp.knowledgeType",
         FT_UINT32, BASE_DEC, VALS(disp_T_knowledgeType_vals), 0,
-        "T_knowledgeType", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_extendedKnowledge,
       { "extendedKnowledge", "disp.extendedKnowledge",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
@@ -1732,7 +1732,7 @@ void proto_register_disp(void) {
     { &hf_disp_allAttributes,
       { "allAttributes", "disp.allAttributes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_include,
       { "include", "disp.include",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -1792,7 +1792,7 @@ void proto_register_disp(void) {
     { &hf_disp_updateStrategy,
       { "updateStrategy", "disp.updateStrategy",
         FT_UINT32, BASE_DEC, VALS(disp_T_updateStrategy_vals), 0,
-        "T_updateStrategy", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_standardUpdate,
       { "standard", "disp.standard",
         FT_UINT32, BASE_DEC, VALS(disp_StandardUpdate_vals), 0,
@@ -1812,7 +1812,7 @@ void proto_register_disp(void) {
     { &hf_disp_signedCoordinateShadowUpdateArgument,
       { "signedCoordinateShadowUpdateArgument", "disp.signedCoordinateShadowUpdateArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedCoordinateShadowUpdateArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_coordinateShadowUpdateArgument,
       { "coordinateShadowUpdateArgument", "disp.coordinateShadowUpdateArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1856,7 +1856,7 @@ void proto_register_disp(void) {
     { &hf_disp_signedInformation,
       { "signedInformation", "disp.signedInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_information_data,
       { "information", "disp.information",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1864,11 +1864,11 @@ void proto_register_disp(void) {
     { &hf_disp_requestedStrategy,
       { "requestedStrategy", "disp.requestedStrategy",
         FT_UINT32, BASE_DEC, VALS(disp_T_requestedStrategy_vals), 0,
-        "T_requestedStrategy", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_standard,
       { "standard", "disp.standard",
         FT_UINT32, BASE_DEC, VALS(disp_T_standard_vals), 0,
-        "T_standard", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_unsignedRequestShadowUpdateArgument,
       { "unsignedRequestShadowUpdateArgument", "disp.unsignedRequestShadowUpdateArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1876,7 +1876,7 @@ void proto_register_disp(void) {
     { &hf_disp_signedRequestShadowUpdateArgument,
       { "signedRequestShadowUpdateArgument", "disp.signedRequestShadowUpdateArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedRequestShadowUpdateArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_requestShadowUpdateArgument,
       { "requestShadowUpdateArgument", "disp.requestShadowUpdateArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1900,7 +1900,7 @@ void proto_register_disp(void) {
     { &hf_disp_signedUpdateShadowArgument,
       { "signedUpdateShadowArgument", "disp.signedUpdateShadowArgument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedUpdateShadowArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_updateShadowArgument,
       { "updateShadowArgument", "disp.updateShadowArgument",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1916,7 +1916,7 @@ void proto_register_disp(void) {
     { &hf_disp_noRefresh,
       { "noRefresh", "disp.noRefresh",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_total,
       { "total", "disp.total",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1980,7 +1980,7 @@ void proto_register_disp(void) {
     { &hf_disp_sDSEChanges,
       { "sDSEChanges", "disp.sDSEChanges",
         FT_UINT32, BASE_DEC, VALS(disp_T_sDSEChanges_vals), 0,
-        "T_sDSEChanges", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_add,
       { "add", "disp.add",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1988,7 +1988,7 @@ void proto_register_disp(void) {
     { &hf_disp_remove,
       { "remove", "disp.remove",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_modify,
       { "modify", "disp.modify",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2004,7 +2004,7 @@ void proto_register_disp(void) {
     { &hf_disp_rename,
       { "rename", "disp.rename",
         FT_UINT32, BASE_DEC, VALS(disp_T_rename_vals), 0,
-        "T_rename", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_newRDN,
       { "newRDN", "disp.newRDN",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2016,7 +2016,7 @@ void proto_register_disp(void) {
     { &hf_disp_attributeChanges,
       { "attributeChanges", "disp.attributeChanges",
         FT_UINT32, BASE_DEC, VALS(disp_T_attributeChanges_vals), 0,
-        "T_attributeChanges", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_replace,
       { "replace", "disp.replace",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -2052,7 +2052,7 @@ void proto_register_disp(void) {
     { &hf_disp_signedShadowError,
       { "signedShadowError", "disp.signedShadowError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_signedShadowError", HFILL }},
+        NULL, HFILL }},
     { &hf_disp_shadowError,
       { "shadowError", "disp.shadowError",
         FT_NONE, BASE_NONE, NULL, 0,