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

diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index cf0931738f..65f256b52a 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1096,7 +1096,7 @@ void proto_register_h235(void) {
     { &hf_h235_eckasdhp,
       { "eckasdhp", "h235.eckasdhp",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_eckasdhp", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_public_key,
       { "public-key", "h235.public_key",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1120,7 +1120,7 @@ void proto_register_h235(void) {
     { &hf_h235_eckasdh2,
       { "eckasdh2", "h235.eckasdh2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_eckasdh2", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_fieldSize,
       { "fieldSize", "h235.fieldSize",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -1136,35 +1136,35 @@ void proto_register_h235(void) {
     { &hf_h235_default,
       { "default", "h235.default",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_radius,
       { "radius", "h235.radius",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_dhExch,
       { "dhExch", "h235.dhExch",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_pwdSymEnc,
       { "pwdSymEnc", "h235.pwdSymEnc",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_pwdHash,
       { "pwdHash", "h235.pwdHash",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_certSign,
       { "certSign", "h235.certSign",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_ipsec,
       { "ipsec", "h235.ipsec",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_tls,
       { "tls", "h235.tls",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_nonStandard,
       { "nonStandard", "h235.nonStandard",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1304,7 +1304,7 @@ void proto_register_h235(void) {
     { &hf_h235_cryptoEncryptedToken,
       { "cryptoEncryptedToken", "h235.cryptoEncryptedToken",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_cryptoEncryptedToken", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_encryptedToken,
       { "token", "h235.token",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1312,7 +1312,7 @@ void proto_register_h235(void) {
     { &hf_h235_cryptoSignedToken,
       { "cryptoSignedToken", "h235.cryptoSignedToken",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_cryptoSignedToken", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_signedToken,
       { "token", "h235.token",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1320,7 +1320,7 @@ void proto_register_h235(void) {
     { &hf_h235_cryptoHashedToken,
       { "cryptoHashedToken", "h235.cryptoHashedToken",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_cryptoHashedToken", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_hashedVals,
       { "hashedVals", "h235.hashedVals",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1404,7 +1404,7 @@ void proto_register_h235(void) {
     { &hf_h235_lifetime,
       { "lifetime", "h235.lifetime",
         FT_UINT32, BASE_DEC, VALS(h235_T_lifetime_vals), 0,
-        "T_lifetime", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_powerOfTwo,
       { "powerOfTwo", "h235.powerOfTwo",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -1416,7 +1416,7 @@ void proto_register_h235(void) {
     { &hf_h235_mki,
       { "mki", "h235.mki",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_mki", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_length,
       { "length", "h235.length",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -1460,11 +1460,11 @@ void proto_register_h235(void) {
     { &hf_h235_fecBeforeSrtp,
       { "fecBeforeSrtp", "h235.fecBeforeSrtp",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_h235_fecAfterSrtp,
       { "fecAfterSrtp", "h235.fecAfterSrtp",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-h235-hfarr.c ---*/
 #line 74 "packet-h235-template.c"