1 files changed, 65 insertions, 65 deletions

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index e8477c9b0f..de58e57fcb 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3292,263 +3292,263 @@ void proto_register_snmp(void) {
     { &hf_snmp_SMUX_PDUs_PDU,
       { "SMUX-PDUs", "snmp.SMUX_PDUs",
         FT_UINT32, BASE_DEC, VALS(snmp_SMUX_PDUs_vals), 0,
-        "snmp.SMUX_PDUs", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_version,
       { "version", "snmp.version",
         FT_INT32, BASE_DEC, VALS(snmp_Version_vals), 0,
-        "snmp.Version", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_community,
       { "community", "snmp.community",
         FT_STRING, BASE_NONE, NULL, 0,
-        "snmp.Community", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_data,
       { "data", "snmp.data",
         FT_UINT32, BASE_DEC, VALS(snmp_PDUs_vals), 0,
-        "snmp.PDUs", HFILL }},
+        "PDUs", HFILL }},
     { &hf_snmp_parameters,
       { "parameters", "snmp.parameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_snmp_datav2u,
       { "datav2u", "snmp.datav2u",
         FT_UINT32, BASE_DEC, VALS(snmp_T_datav2u_vals), 0,
-        "snmp.T_datav2u", HFILL }},
+        "T_datav2u", HFILL }},
     { &hf_snmp_v2u_plaintext,
       { "plaintext", "snmp.plaintext",
         FT_UINT32, BASE_DEC, VALS(snmp_PDUs_vals), 0,
-        "snmp.PDUs", HFILL }},
+        "PDUs", HFILL }},
     { &hf_snmp_encrypted,
       { "encrypted", "snmp.encrypted",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_snmp_msgAuthoritativeEngineID,
       { "msgAuthoritativeEngineID", "snmp.msgAuthoritativeEngineID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.T_msgAuthoritativeEngineID", HFILL }},
+        "T_msgAuthoritativeEngineID", HFILL }},
     { &hf_snmp_msgAuthoritativeEngineBoots,
       { "msgAuthoritativeEngineBoots", "snmp.msgAuthoritativeEngineBoots",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.T_msgAuthoritativeEngineBoots", HFILL }},
+        "T_msgAuthoritativeEngineBoots", HFILL }},
     { &hf_snmp_msgAuthoritativeEngineTime,
       { "msgAuthoritativeEngineTime", "snmp.msgAuthoritativeEngineTime",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.T_msgAuthoritativeEngineTime", HFILL }},
+        "T_msgAuthoritativeEngineTime", HFILL }},
     { &hf_snmp_msgUserName,
       { "msgUserName", "snmp.msgUserName",
         FT_STRING, BASE_NONE, NULL, 0,
-        "snmp.T_msgUserName", HFILL }},
+        "T_msgUserName", HFILL }},
     { &hf_snmp_msgAuthenticationParameters,
       { "msgAuthenticationParameters", "snmp.msgAuthenticationParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.T_msgAuthenticationParameters", HFILL }},
+        "T_msgAuthenticationParameters", HFILL }},
     { &hf_snmp_msgPrivacyParameters,
       { "msgPrivacyParameters", "snmp.msgPrivacyParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.T_msgPrivacyParameters", HFILL }},
+        "T_msgPrivacyParameters", HFILL }},
     { &hf_snmp_msgVersion,
       { "msgVersion", "snmp.msgVersion",
         FT_INT32, BASE_DEC, VALS(snmp_Version_vals), 0,
-        "snmp.Version", HFILL }},
+        "Version", HFILL }},
     { &hf_snmp_msgGlobalData,
       { "msgGlobalData", "snmp.msgGlobalData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.HeaderData", HFILL }},
+        "HeaderData", HFILL }},
     { &hf_snmp_msgSecurityParameters,
       { "msgSecurityParameters", "snmp.msgSecurityParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.T_msgSecurityParameters", HFILL }},
+        "T_msgSecurityParameters", HFILL }},
     { &hf_snmp_msgData,
       { "msgData", "snmp.msgData",
         FT_UINT32, BASE_DEC, VALS(snmp_ScopedPduData_vals), 0,
-        "snmp.ScopedPduData", HFILL }},
+        "ScopedPduData", HFILL }},
     { &hf_snmp_msgID,
       { "msgID", "snmp.msgID",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER_0_2147483647", HFILL }},
+        "INTEGER_0_2147483647", HFILL }},
     { &hf_snmp_msgMaxSize,
       { "msgMaxSize", "snmp.msgMaxSize",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER_484_2147483647", HFILL }},
+        "INTEGER_484_2147483647", HFILL }},
     { &hf_snmp_msgFlags,
       { "msgFlags", "snmp.msgFlags",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.T_msgFlags", HFILL }},
+        "T_msgFlags", HFILL }},
     { &hf_snmp_msgSecurityModel,
       { "msgSecurityModel", "snmp.msgSecurityModel",
         FT_UINT32, BASE_DEC, VALS(sec_models), 0,
-        "snmp.T_msgSecurityModel", HFILL }},
+        "T_msgSecurityModel", HFILL }},
     { &hf_snmp_plaintext,
       { "plaintext", "snmp.plaintext",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.ScopedPDU", HFILL }},
+        "ScopedPDU", HFILL }},
     { &hf_snmp_encryptedPDU,
       { "encryptedPDU", "snmp.encryptedPDU",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.T_encryptedPDU", HFILL }},
+        "T_encryptedPDU", HFILL }},
     { &hf_snmp_contextEngineID,
       { "contextEngineID", "snmp.contextEngineID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.SnmpEngineID", HFILL }},
+        "SnmpEngineID", HFILL }},
     { &hf_snmp_contextName,
       { "contextName", "snmp.contextName",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_snmp_get_request,
       { "get-request", "snmp.get_request",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.GetRequest_PDU", HFILL }},
+        "GetRequest_PDU", HFILL }},
     { &hf_snmp_get_next_request,
       { "get-next-request", "snmp.get_next_request",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.GetNextRequest_PDU", HFILL }},
+        "GetNextRequest_PDU", HFILL }},
     { &hf_snmp_get_response,
       { "get-response", "snmp.get_response",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.GetResponse_PDU", HFILL }},
+        "GetResponse_PDU", HFILL }},
     { &hf_snmp_set_request,
       { "set-request", "snmp.set_request",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.SetRequest_PDU", HFILL }},
+        "SetRequest_PDU", HFILL }},
     { &hf_snmp_trap,
       { "trap", "snmp.trap",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.Trap_PDU", HFILL }},
+        "Trap_PDU", HFILL }},
     { &hf_snmp_getBulkRequest,
       { "getBulkRequest", "snmp.getBulkRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.GetBulkRequest_PDU", HFILL }},
+        "GetBulkRequest_PDU", HFILL }},
     { &hf_snmp_informRequest,
       { "informRequest", "snmp.informRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.InformRequest_PDU", HFILL }},
+        "InformRequest_PDU", HFILL }},
     { &hf_snmp_sNMPv2_Trap,
       { "sNMPv2-Trap", "snmp.sNMPv2_Trap",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.SNMPv2_Trap_PDU", HFILL }},
+        "SNMPv2_Trap_PDU", HFILL }},
     { &hf_snmp_report,
       { "report", "snmp.report",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.Report_PDU", HFILL }},
+        "Report_PDU", HFILL }},
     { &hf_snmp_request_id,
       { "request-id", "snmp.request_id",
         FT_INT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_snmp_error_status,
       { "error-status", "snmp.error_status",
         FT_INT32, BASE_DEC, VALS(snmp_T_error_status_vals), 0,
-        "snmp.T_error_status", HFILL }},
+        "T_error_status", HFILL }},
     { &hf_snmp_error_index,
       { "error-index", "snmp.error_index",
         FT_INT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_snmp_variable_bindings,
       { "variable-bindings", "snmp.variable_bindings",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.VarBindList", HFILL }},
+        "VarBindList", HFILL }},
     { &hf_snmp_bulkPDU_request_id,
       { "request-id", "snmp.request_id",
         FT_INT32, BASE_DEC, NULL, 0,
-        "snmp.Integer32", HFILL }},
+        "Integer32", HFILL }},
     { &hf_snmp_non_repeaters,
       { "non-repeaters", "snmp.non_repeaters",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER_0_2147483647", HFILL }},
+        "INTEGER_0_2147483647", HFILL }},
     { &hf_snmp_max_repetitions,
       { "max-repetitions", "snmp.max_repetitions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER_0_2147483647", HFILL }},
+        "INTEGER_0_2147483647", HFILL }},
     { &hf_snmp_enterprise,
       { "enterprise", "snmp.enterprise",
         FT_OID, BASE_NONE, NULL, 0,
-        "snmp.EnterpriseOID", HFILL }},
+        "EnterpriseOID", HFILL }},
     { &hf_snmp_agent_addr,
       { "agent-addr", "snmp.agent_addr",
         FT_IPv4, BASE_NONE, NULL, 0,
-        "snmp.NetworkAddress", HFILL }},
+        "NetworkAddress", HFILL }},
     { &hf_snmp_generic_trap,
       { "generic-trap", "snmp.generic_trap",
         FT_INT32, BASE_DEC, VALS(snmp_GenericTrap_vals), 0,
-        "snmp.GenericTrap", HFILL }},
+        "GenericTrap", HFILL }},
     { &hf_snmp_specific_trap,
       { "specific-trap", "snmp.specific_trap",
         FT_INT32, BASE_DEC, NULL, 0,
-        "snmp.SpecificTrap", HFILL }},
+        "SpecificTrap", HFILL }},
     { &hf_snmp_time_stamp,
       { "time-stamp", "snmp.time_stamp",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "snmp.TimeTicks", HFILL }},
+        "TimeTicks", HFILL }},
     { &hf_snmp_name,
       { "name", "snmp.name",
         FT_OID, BASE_NONE, NULL, 0,
-        "snmp.ObjectName", HFILL }},
+        "ObjectName", HFILL }},
     { &hf_snmp_valueType,
       { "valueType", "snmp.valueType",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.NULL", HFILL }},
+        "NULL", HFILL }},
     { &hf_snmp_VarBindList_item,
       { "VarBind", "snmp.VarBind",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.VarBind", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_open,
       { "open", "snmp.open",
         FT_UINT32, BASE_DEC, VALS(snmp_OpenPDU_vals), 0,
-        "snmp.OpenPDU", HFILL }},
+        "OpenPDU", HFILL }},
     { &hf_snmp_close,
       { "close", "snmp.close",
         FT_INT32, BASE_DEC, VALS(snmp_ClosePDU_U_vals), 0,
-        "snmp.ClosePDU", HFILL }},
+        "ClosePDU", HFILL }},
     { &hf_snmp_registerRequest,
       { "registerRequest", "snmp.registerRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.RReqPDU", HFILL }},
+        "RReqPDU", HFILL }},
     { &hf_snmp_registerResponse,
       { "registerResponse", "snmp.registerResponse",
         FT_UINT32, BASE_DEC, VALS(snmp_RegisterResponse_vals), 0,
-        "snmp.RegisterResponse", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_commitOrRollback,
       { "commitOrRollback", "snmp.commitOrRollback",
         FT_INT32, BASE_DEC, VALS(snmp_SOutPDU_U_vals), 0,
-        "snmp.SOutPDU", HFILL }},
+        "SOutPDU", HFILL }},
     { &hf_snmp_rRspPDU,
       { "rRspPDU", "snmp.rRspPDU",
         FT_INT32, BASE_DEC, VALS(snmp_RRspPDU_U_vals), 0,
-        "snmp.RRspPDU", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_pDUs,
       { "pDUs", "snmp.pDUs",
         FT_UINT32, BASE_DEC, VALS(snmp_PDUs_vals), 0,
-        "snmp.PDUs", HFILL }},
+        NULL, HFILL }},
     { &hf_snmp_smux_simple,
       { "smux-simple", "snmp.smux_simple",
         FT_NONE, BASE_NONE, NULL, 0,
-        "snmp.SimpleOpen", HFILL }},
+        "SimpleOpen", HFILL }},
     { &hf_snmp_smux_version,
       { "smux-version", "snmp.smux_version",
         FT_INT32, BASE_DEC, VALS(snmp_T_smux_version_vals), 0,
-        "snmp.T_smux_version", HFILL }},
+        "T_smux_version", HFILL }},
     { &hf_snmp_identity,
       { "identity", "snmp.identity",
         FT_OID, BASE_NONE, NULL, 0,
-        "snmp.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_snmp_description,
       { "description", "snmp.description",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.DisplayString", HFILL }},
+        "DisplayString", HFILL }},
     { &hf_snmp_password,
       { "password", "snmp.password",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "snmp.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_snmp_subtree,
       { "subtree", "snmp.subtree",
         FT_OID, BASE_NONE, NULL, 0,
-        "snmp.ObjectName", HFILL }},
+        "ObjectName", HFILL }},
     { &hf_snmp_priority,
       { "priority", "snmp.priority",
         FT_INT32, BASE_DEC, NULL, 0,
-        "snmp.INTEGER_M1_2147483647", HFILL }},
+        "INTEGER_M1_2147483647", HFILL }},
     { &hf_snmp_operation,
       { "operation", "snmp.operation",
         FT_INT32, BASE_DEC, VALS(snmp_T_operation_vals), 0,
-        "snmp.T_operation", HFILL }},
+        "T_operation", HFILL }},
 
 /*--- End of included file: packet-snmp-hfarr.c ---*/
 #line 2066 "packet-snmp-template.c"