More header_field_info cleanup.

svn path=/trunk/; revision=28798

1 files changed, 42 insertions, 42 deletions

diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 1138569ff1..3ca5f2cec7 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1851,68 +1851,68 @@ void proto_register_snmp(void) {
   static hf_register_info hf[] = {
 		{ &hf_snmp_v3_flags_auth,
 		{ "Authenticated", "snmp.v3.flags.auth", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), TH_AUTH, "", HFILL }},
+		    TFS(&flags_set_truth), TH_AUTH, NULL, HFILL }},
 		{ &hf_snmp_v3_flags_crypt,
 		{ "Encrypted", "snmp.v3.flags.crypt", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), TH_CRYPT, "", HFILL }},
+		    TFS(&flags_set_truth), TH_CRYPT, NULL, HFILL }},
 		{ &hf_snmp_v3_flags_report,
 		{ "Reportable", "snmp.v3.flags.report", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), TH_REPORT, "", HFILL }},
+		    TFS(&flags_set_truth), TH_REPORT, NULL, HFILL }},
 		{ &hf_snmp_engineid_conform, {
 		    "Engine ID Conformance", "snmp.engineid.conform", FT_BOOLEAN, 8,
 		    TFS(&tfs_snmp_engineid_conform), F_SNMP_ENGINEID_CONFORM, "Engine ID RFC3411 Conformance", HFILL }},
 		{ &hf_snmp_engineid_enterprise, {
 		    "Engine Enterprise ID", "snmp.engineid.enterprise", FT_UINT32, BASE_DEC,
-		    VALS(sminmpec_values), 0, "Engine Enterprise ID", HFILL }},
+		    VALS(sminmpec_values), 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_format, {
 		    "Engine ID Format", "snmp.engineid.format", FT_UINT8, BASE_DEC,
-		    VALS(snmp_engineid_format_vals), 0, "Engine ID Format", HFILL }},
+		    VALS(snmp_engineid_format_vals), 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_ipv4, {
 		    "Engine ID Data: IPv4 address", "snmp.engineid.ipv4", FT_IPv4, BASE_NONE,
-		    NULL, 0, "Engine ID Data: IPv4 address", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_ipv6, {
 		    "Engine ID Data: IPv6 address", "snmp.engineid.ipv6", FT_IPv6, BASE_NONE,
-		    NULL, 0, "Engine ID Data: IPv6 address", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_mac, {
 		    "Engine ID Data: MAC address", "snmp.engineid.mac", FT_ETHER, BASE_NONE,
-		    NULL, 0, "Engine ID Data: MAC address", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_text, {
 		    "Engine ID Data: Text", "snmp.engineid.text", FT_STRING, BASE_NONE,
-		    NULL, 0, "Engine ID Data: Text", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_time, {
 		    "Engine ID Data: Time", "snmp.engineid.time", FT_ABSOLUTE_TIME, BASE_NONE,
-		    NULL, 0, "Engine ID Data: Time", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_snmp_engineid_data, {
-		    "Engine ID Data", "snmp.engineid.data", FT_BYTES, BASE_HEX,
-		    NULL, 0, "Engine ID Data", HFILL }},
-		  { &hf_snmp_msgAuthentication,
-				{ "Authentication", "snmp.v3.auth", FT_BOOLEAN, 8,
-					TFS(&auth_flags), 0, "", HFILL }},
-		  { &hf_snmp_decryptedPDU, {
-					"Decrypted ScopedPDU", "snmp.decrypted_pdu", FT_BYTES, BASE_HEX,
-					NULL, 0, "Decrypted PDU", HFILL }},
-  { &hf_snmp_noSuchObject, { "noSuchObject", "snmp.noSuchObject", FT_NONE, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_noSuchInstance, { "noSuchInstance", "snmp.noSuchInstance", FT_NONE, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_endOfMibView, { "endOfMibView", "snmp.endOfMibView", FT_NONE, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_unSpecified, { "unSpecified", "snmp.unSpecified", FT_NONE, BASE_DEC,  NULL, 0, "", HFILL }},
-
-  { &hf_snmp_integer32_value, { "Value (Integer32)", "snmp.value.int", FT_INT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_octetstring_value, { "Value (OctetString)", "snmp.value.octets", FT_BYTES, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_oid_value, { "Value (OID)", "snmp.value.oid", FT_OID, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_null_value, { "Value (Null)", "snmp.value.null", FT_NONE, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_ipv4_value, { "Value (IpAddress)", "snmp.value.ipv4", FT_IPv4, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_ipv6_value, { "Value (IpAddress)", "snmp.value.ipv6", FT_IPv6, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_anyaddress_value, { "Value (IpAddress)", "snmp.value.addr", FT_BYTES, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_unsigned32_value, { "Value (Unsigned32)", "snmp.value.u32", FT_INT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_gauge32_value, { "Value (Gauge32)", "snmp.value.g32", FT_INT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_unknown_value, { "Value (Unknown)", "snmp.value.unk", FT_BYTES, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_counter_value, { "Value (Counter32)", "snmp.value.counter", FT_UINT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_big_counter_value, { "Value (Counter64)", "snmp.value.counter", FT_UINT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_nsap_value, { "Value (NSAP)", "snmp.value.nsap", FT_UINT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_timeticks_value, { "Value (Timeticks)", "snmp.value.timeticks", FT_UINT64, BASE_DEC,  NULL, 0, "", HFILL }},
-  { &hf_snmp_opaque_value, { "Value (Opaque)", "snmp.value.opaque", FT_BYTES, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_objectname, { "Object Name", "snmp.name", FT_OID, BASE_NONE,  NULL, 0, "", HFILL }},
-  { &hf_snmp_scalar_instance_index, { "Scalar Instance Index", "snmp.name.index", FT_UINT64, BASE_DEC,  NULL, 0, "", HFILL }},
+		    "Engine ID Data", "snmp.engineid.data", FT_BYTES, BASE_NONE,
+		    NULL, 0, NULL, HFILL }},
+		{ &hf_snmp_msgAuthentication, {
+		    "Authentication", "snmp.v3.auth", FT_BOOLEAN, 8,
+		    TFS(&auth_flags), 0, NULL, HFILL }},
+		{ &hf_snmp_decryptedPDU, {
+	  	    "Decrypted ScopedPDU", "snmp.decrypted_pdu", FT_BYTES, BASE_NONE,
+		    NULL, 0, "Decrypted PDU", HFILL }},
+  { &hf_snmp_noSuchObject, { "noSuchObject", "snmp.noSuchObject", FT_NONE, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_noSuchInstance, { "noSuchInstance", "snmp.noSuchInstance", FT_NONE, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_endOfMibView, { "endOfMibView", "snmp.endOfMibView", FT_NONE, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_unSpecified, { "unSpecified", "snmp.unSpecified", FT_NONE, BASE_NONE,  NULL, 0, NULL, HFILL }},
+
+  { &hf_snmp_integer32_value, { "Value (Integer32)", "snmp.value.int", FT_INT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_octetstring_value, { "Value (OctetString)", "snmp.value.octets", FT_BYTES, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_oid_value, { "Value (OID)", "snmp.value.oid", FT_OID, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_null_value, { "Value (Null)", "snmp.value.null", FT_NONE, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_ipv4_value, { "Value (IpAddress)", "snmp.value.ipv4", FT_IPv4, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_ipv6_value, { "Value (IpAddress)", "snmp.value.ipv6", FT_IPv6, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_anyaddress_value, { "Value (IpAddress)", "snmp.value.addr", FT_BYTES, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_unsigned32_value, { "Value (Unsigned32)", "snmp.value.u32", FT_INT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_gauge32_value, { "Value (Gauge32)", "snmp.value.g32", FT_INT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_unknown_value, { "Value (Unknown)", "snmp.value.unk", FT_BYTES, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_counter_value, { "Value (Counter32)", "snmp.value.counter", FT_UINT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_big_counter_value, { "Value (Counter64)", "snmp.value.counter", FT_UINT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_nsap_value, { "Value (NSAP)", "snmp.value.nsap", FT_UINT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_timeticks_value, { "Value (Timeticks)", "snmp.value.timeticks", FT_UINT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_opaque_value, { "Value (Opaque)", "snmp.value.opaque", FT_BYTES, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_objectname, { "Object Name", "snmp.name", FT_OID, BASE_NONE,  NULL, 0, NULL, HFILL }},
+  { &hf_snmp_scalar_instance_index, { "Scalar Instance Index", "snmp.name.index", FT_UINT64, BASE_DEC,  NULL, 0, NULL, HFILL }},
 
 
 #include "packet-snmp-hfarr.c"
@@ -2040,10 +2040,10 @@ proto_register_smux(void)
 	static hf_register_info hf[] = {
 		{ &hf_smux_version,
 		{ "Version", "smux.version", FT_UINT8, BASE_DEC, NULL,
-		    0x0, "", HFILL }},
+		    0x0, NULL, HFILL }},
 		{ &hf_smux_pdutype,
 		{ "PDU type", "smux.pdutype", FT_UINT8, BASE_DEC, VALS(smux_types),
-		    0x0, "", HFILL }},
+		    0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_smux,