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

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index de58e57fcb..5390a10c5b 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3312,7 +3312,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_datav2u,
       { "datav2u", "snmp.datav2u",
         FT_UINT32, BASE_DEC, VALS(snmp_T_datav2u_vals), 0,
-        "T_datav2u", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_v2u_plaintext,
       { "plaintext", "snmp.plaintext",
         FT_UINT32, BASE_DEC, VALS(snmp_PDUs_vals), 0,
@@ -3324,27 +3324,27 @@ void proto_register_snmp(void) {
     { &hf_snmp_msgAuthoritativeEngineID,
       { "msgAuthoritativeEngineID", "snmp.msgAuthoritativeEngineID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_msgAuthoritativeEngineID", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgAuthoritativeEngineBoots,
       { "msgAuthoritativeEngineBoots", "snmp.msgAuthoritativeEngineBoots",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_msgAuthoritativeEngineBoots", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgAuthoritativeEngineTime,
       { "msgAuthoritativeEngineTime", "snmp.msgAuthoritativeEngineTime",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_msgAuthoritativeEngineTime", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgUserName,
       { "msgUserName", "snmp.msgUserName",
         FT_STRING, BASE_NONE, NULL, 0,
-        "T_msgUserName", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgAuthenticationParameters,
       { "msgAuthenticationParameters", "snmp.msgAuthenticationParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_msgAuthenticationParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgPrivacyParameters,
       { "msgPrivacyParameters", "snmp.msgPrivacyParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_msgPrivacyParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgVersion,
       { "msgVersion", "snmp.msgVersion",
         FT_INT32, BASE_DEC, VALS(snmp_Version_vals), 0,
@@ -3356,7 +3356,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_msgSecurityParameters,
       { "msgSecurityParameters", "snmp.msgSecurityParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_msgSecurityParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgData,
       { "msgData", "snmp.msgData",
         FT_UINT32, BASE_DEC, VALS(snmp_ScopedPduData_vals), 0,
@@ -3372,11 +3372,11 @@ void proto_register_snmp(void) {
     { &hf_snmp_msgFlags,
       { "msgFlags", "snmp.msgFlags",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_msgFlags", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_msgSecurityModel,
       { "msgSecurityModel", "snmp.msgSecurityModel",
         FT_UINT32, BASE_DEC, VALS(sec_models), 0,
-        "T_msgSecurityModel", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_plaintext,
       { "plaintext", "snmp.plaintext",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -3384,7 +3384,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_encryptedPDU,
       { "encryptedPDU", "snmp.encryptedPDU",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_encryptedPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_contextEngineID,
       { "contextEngineID", "snmp.contextEngineID",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -3436,7 +3436,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_error_status,
       { "error-status", "snmp.error_status",
         FT_INT32, BASE_DEC, VALS(snmp_T_error_status_vals), 0,
-        "T_error_status", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_error_index,
       { "error-index", "snmp.error_index",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -3484,7 +3484,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_valueType,
       { "valueType", "snmp.valueType",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_VarBindList_item,
       { "VarBind", "snmp.VarBind",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -3524,7 +3524,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_smux_version,
       { "smux-version", "snmp.smux_version",
         FT_INT32, BASE_DEC, VALS(snmp_T_smux_version_vals), 0,
-        "T_smux_version", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_identity,
       { "identity", "snmp.identity",
         FT_OID, BASE_NONE, NULL, 0,
@@ -3548,7 +3548,7 @@ void proto_register_snmp(void) {
     { &hf_snmp_operation,
       { "operation", "snmp.operation",
         FT_INT32, BASE_DEC, VALS(snmp_T_operation_vals), 0,
-        "T_operation", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-snmp-hfarr.c ---*/
 #line 2066 "packet-snmp-template.c"