From Kovarththanan Rajaratnam:

More header field info cleanup in plugins/* and epan/dissectors/*


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28811 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 177 insertions, 177 deletions

diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 185ac6f953..09a3b68498 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -2049,644 +2049,644 @@ proto_register_lmp(void)
 	   /* Message type number */
 	   {&lmp_filter[LMPF_MSG],
 		{ "Message Type", "lmp.msg", FT_UINT8, BASE_DEC, VALS(message_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   /* Message type shorthands */
 	   {&lmp_filter[LMPF_MSG_CONFIG],
 		{ "Config Message", "lmp.msg.config", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_CONFIG_ACK],
 		{ "ConfigAck Message", "lmp.msg.configack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_CONFIG_NACK],
 		{ "ConfigNack Message", "lmp.msg.confignack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_HELLO],
 		{ "HELLO Message", "lmp.msg.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_BEGIN_VERIFY],
 		{ "BeginVerify Message", "lmp.msg.beginverify", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_ACK],
 		{ "BeginVerifyAck Message", "lmp.msg.beginverifyack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_NACK],
 		{ "BeginVerifyNack Message", "lmp.msg.beginverifynack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_END_VERIFY],
 		{ "EndVerify Message", "lmp.msg.endverify", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_END_VERIFY_ACK],
 		{ "EndVerifyAck Message", "lmp.msg.endverifyack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TEST],
 		{ "Test Message", "lmp.msg.test", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TEST_STATUS_SUCCESS],
 		{ "TestStatusSuccess Message", "lmp.msg.teststatussuccess", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TEST_STATUS_FAILURE],
 		{ "TestStatusFailure Message", "lmp.msg.teststatusfailure", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TEST_STATUS_ACK],
 		{ "TestStatusAck Message", "lmp.msg.teststatusack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_LINK_SUMMARY],
 		{ "LinkSummary Message", "lmp.msg.linksummary", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_LINK_SUMMARY_ACK],
 		{ "LinkSummaryAck Message", "lmp.msg.linksummaryack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_LINK_SUMMARY_NACK],
 		{ "LinkSummaryNack Message", "lmp.msg.linksummarynack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_CHANNEL_STATUS],
 		{ "ChannelStatus Message", "lmp.msg.channelstatus", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_ACK],
 		{ "ChannelStatusAck Message", "lmp.msg.channelstatusack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_REQ],
 		{ "ChannelStatusRequest Message", "lmp.msg.channelstatusrequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_RESP],
 		{ "ChannelStatusResponse Message", "lmp.msg.channelstatusresponse", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_MONITOR],
 		{ "TraceMonitor Message", "lmp.msg.tracemonitor", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_MONITOR_ACK],
 		{ "TraceMonitorAck Message", "lmp.msg.tracemonitorack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_MONITOR_NACK],
 		{ "TraceMonitorNack Message", "lmp.msg.tracemonitornack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_MISMATCH],
 		{ "TraceMismatch Message", "lmp.msg.tracemismatch", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_MISMATCH_ACK],
 		{ "TraceMismatchAck Message", "lmp.msg.tracemismatchack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_REQUEST],
 		{ "TraceRequest Message", "lmp.msg.tracerequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_REPORT],
 		{ "TraceReport Message", "lmp.msg.tracereport", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_TRACE_REQUEST_NACK],
 		{ "TraceRequestNack Message", "lmp.msg.tracerequestnack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_INSERT_TRACE],
 		{ "InsertTrace Message", "lmp.msg.inserttrace", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_INSERT_TRACE_ACK],
 		{ "InsertTraceAck Message", "lmp.msg.inserttraceack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_INSERT_TRACE_NACK],
 		{ "InsertTraceNack Message", "lmp.msg.inserttracenack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_SERVICE_CONFIG],
 		{ "ServiceConfig Message", "lmp.msg.serviceconfig", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_SERVICE_CONFIG_ACK],
 		{ "ServiceConfigAck Message", "lmp.msg.serviceconfigack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_SERVICE_CONFIG_NACK],
 		{ "ServiceConfigNack Message", "lmp.msg.serviceconfignack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_DISCOVERY_RESP],
 		{ "DiscoveryResponse Message", "lmp.msg.discoveryresp", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_DISCOVERY_RESP_ACK],
 		{ "DiscoveryResponseAck Message", "lmp.msg.discoveryrespack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_MSG_DISCOVERY_RESP_NACK],
 		{ "DiscoveryResponseNack Message", "lmp.msg.discoveryrespnack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   /* LMP Message Header Fields ------------------- */
 
 	   {&lmp_filter[LMPF_HDR_FLAGS],
 		{ "LMP Header - Flags", "lmp.hdr.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_HDR_FLAGS_CC_DOWN],
 		{ "ControlChannelDown", "lmp.hdr.ccdown", FT_BOOLEAN, 8, NULL, 0x01,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_HDR_FLAGS_REBOOT],
 		{ "Reboot", "lmp.hdr.reboot", FT_BOOLEAN, 8, NULL, 0x02,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   /* LMP object class filters ------------------------------- */
 
 	   {&lmp_filter[LMPF_OBJECT],
 		{ "LOCAL_CCID", "lmp.object", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_CCID],
 		{ "CCID", "lmp.obj.ccid", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_NODE_ID],
 		{ "NODE_ID", "lmp.obj.Nodeid", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_LINK_ID],
 		{ "LINK_ID", "lmp.obj.linkid", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_INTERFACE_ID],
 		{ "INTERFACE_ID", "lmp.obj.interfaceid", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_MESSAGE_ID],
 		{ "MESSAGE_ID", "lmp.obj.messageid", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_CONFIG],
 		{ "CONFIG", "lmp.obj.config", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_HELLO],
 		{ "HELLO", "lmp.obj.hello", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY],
 		{ "BEGIN_VERIFY", "lmp.obj.begin_verify", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY_ACK],
 		{ "BEGIN_VERIFY_ACK", "lmp.obj.begin_verify_ack", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_VERIFY_ID],
 		{ "VERIFY_ID", "lmp.obj.verifyid", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_TE_LINK],
 		{ "TE_LINK", "lmp.obj.te_link", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_CLASS_DATA_LINK],
 		{ "DATA_LINK", "lmp.obj.data_link", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS],
 		{ "CHANNEL_STATUS", "lmp.obj.channel_status", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS_REQUEST],
 		{ "CHANNEL_STATUS_REQUEST", "lmp.obj.channel_status_request", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_ERROR],
 		{ "ERROR", "lmp.obj.error", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_TRACE],
 		{ "TRACE", "lmp.obj.trace", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_TRACE_REQ],
 		{ "TRACE REQ", "lmp.obj.trace_req", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_SERVICE_CONFIG],
 		{ "SERVICE_CONFIG", "lmp.obj.serviceconfig", FT_NONE, BASE_NONE, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_DA_DCN_ADDRESS],
 		{ "DA_DCN_ADDRESS", "lmp.obj.dadcnaddr", FT_NONE, BASE_NONE, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_CLASS_LOCAL_LAD_INFO],
 		{ "LOCAL_LAD_INFO", "lmp.obj.localladinfo", FT_NONE, BASE_NONE, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 	   /* Other LMP Value Filters ------------------------------ */
 
 	   {&lmp_filter[LMPF_VAL_CTYPE],
 		{ "Object C-Type", "lmp.obj.ctype", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_LOCAL_CCID],
 		{ "Local CCID Value", "lmp.local_ccid", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_CCID],
 		{ "Remote CCID Value", "lmp.remote_ccid", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_LOCAL_NODE_ID],
 		{ "Local Node ID Value", "lmp.local_nodeid", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_NODE_ID],
 		{ "Remote Node ID Value", "lmp.remote_nodeid", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_IPV4],
 		{ "Local Link ID - IPv4", "lmp.local_linkid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_UNNUM],
 		{ "Local Link ID - Unnumbered", "lmp.local_linkid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_IPV4],
 		{ "Remote Link ID - IPv4", "lmp.remote_linkid_ipv4", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_UNNUM],
 		{ "Remote Link ID - Unnumbered", "lmp.remote_linkid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_IPV4],
 		{ "Local Interface ID - IPv4", "lmp.local_interfaceid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM],
 		{ "Local Interface ID - Unnumbered", "lmp.local_interfaceid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_IPV4],
 		{ "Remote Interface ID - IPv4", "lmp.remote_interfaceid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM],
 		{ "Remote Interface ID - Unnumbered", "lmp.remote_interfaceid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_MESSAGE_ID],
 		{ "Message-ID Value", "lmp.messageid", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_MESSAGE_ID_ACK],
 		{ "Message-ID Ack Value", "lmp.messageid_ack", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_CONFIG_HELLO],
 		{ "HelloInterval", "lmp.hellointerval", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
 		{ "HelloDeadInterval", "lmp.hellodeadinterval", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_HELLO_TXSEQ],
 		{ "TxSeqNum", "lmp.txseqnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_HELLO_RXSEQ],
 		{ "RxSeqNum", "lmp.rxseqnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
 		{ "Flags", "lmp.begin_verify.flags", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
 		{ "Verify All Links", "lmp.begin_verify.all_links",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
 		{ "Data Link Type", "lmp.begin_verify.link_type",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
 		{ "Encoding Type", "lmp.begin_verify.enctype", FT_UINT8, BASE_DEC, VALS(gmpls_lsp_enc_str), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_VERIFY_ID],
 		{ "Verify-ID", "lmp.verifyid", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
 		{ "TE-Link Flags", "lmp.te_link_flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
 		{ "Fault Management Supported", "lmp.te_link.fault_mgmt",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
 		{ "Link Verification Supported", "lmp.te_link.link_verify",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
 		{ "TE-Link Local ID - IPv4", "lmp.te_link.local_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
 		{ "TE-Link Local ID - Unnumbered", "lmp.te_link.local_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
 		{ "TE-Link Remote ID - IPv4", "lmp.te_link.remote_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
 		{ "TE-Link Remote ID - Unnumbered", "lmp.te_link.remote_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
 		{ "Data-Link Flags", "lmp.data_link_flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
 		{ "Data-Link is Individual Port", "lmp.data_link.port",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
 		{ "Data-Link is Allocated", "lmp.data_link.link_verify",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
 		{ "Data-Link Local ID - IPv4", "lmp.data_link.local_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
 		{ "Data-Link Local ID - Unnumbered", "lmp.data_link.local_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
 		{ "Data-Link Remote ID - IPv4", "lmp.data_link.remote_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
 		{ "Data-Link Remote ID - Unnumbered", "lmp.data_link.remote_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
-		{ "Subobject", "lmp.data_link_subobj", FT_NONE, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+		{ "Subobject", "lmp.data_link_subobj", FT_NONE, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
 		{ "Interface Switching Capability", "lmp.data_link_switching", FT_UINT8, BASE_DEC,
-		  VALS(gmpls_switching_type_str), 0x0, "", HFILL }},
+		  VALS(gmpls_switching_type_str), 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
 		{ "LSP Encoding Type", "lmp.data_link_encoding", FT_UINT8, BASE_DEC,
-		  VALS(gmpls_lsp_enc_str), 0x0, "", HFILL }},
+		  VALS(gmpls_lsp_enc_str), 0x0, NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_ERROR],
 		{ "Error Code", "lmp.error", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
 		{ "Verification - Unsupported for this TE-Link", "lmp.error.verify_unsupported_link",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
 		{ "Verification - Unwilling to Verify at this time", "lmp.error.verify_unwilling",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
 		{ "Verification - Transport Unsupported", "lmp.error.verify_unsupported_transport",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
 		{ "Verification - TE Link ID Configuration Error", "lmp.error.verify_te_link_id",
-		  FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNKNOWN_CTYPE],
 		{ "Verification - Unknown Object C-Type", "lmp.error.verify_unknown_ctype",
-		  FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
 		{ "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
 		{ "Summary - Renegotiate Parametere", "lmp.error.summary_renegotiate",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
 		{ "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link",
-		  FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
 		{ "Summary - Bad Data Link Object", "lmp.error.summary_bad_data_link",
-		  FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
 		{ "Summary - Bad TE Link C-Type", "lmp.error.summary_unknown_tel_ctype",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
 		{ "Summary - Bad Data Link C-Type", "lmp.error.summary_unknown_dl_ctype",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID],
 		{ "Summary - Bad Remote Link ID", "lmp.error.summary_bad_remote_link_id",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS],
 		{ "Config - Unacceptable non-negotiable parameters", "lmp.error.config_bad_params",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE],
 		{ "Config - Renegotiate Parameter", "lmp.error.config_renegotiate",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID],
 		{ "Config - Bad CC ID", "lmp.error.config_bad_ccid",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_TRACE_UNSUPPORTED_TYPE],
 		{ "Trace - Unsupported trace type", "lmp.error.trace_unsupported_type",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_TRACE_INVALID_MSG],
 		{ "Trace - Invalid Trace Message", "lmp.error.trace_invalid_msg",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_TRACE_UNKNOWN_CTYPE],
 		{ "Trace - Unknown Object C-Type", "lmp.error.trace_unknown_ctype",
-		  FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_LAD_AREA_ID_MISMATCH],
 		{ "LAD - Domain Routing Area ID Mismatch detected", "lmp.error.lad_area_id_mismatch",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_LAD_TCP_ID_MISMATCH],
 		{ "LAD - TCP ID Mismatch detected", "lmp.error.lad_tcp_id_mismatch",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_LAD_DA_DCN_MISMATCH],
 		{ "LAD - DA DCN Mismatch detected", "lmp.error.lad_da_dcn_mismatch",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_LAD_CAPABILITY_MISMATCH],
 		{ "LAD - Capability Mismatch detected", "lmp.error.lad_capability_mismatch",
-		  FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_ERROR_LAD_UNKNOWN_CTYPE],
 		{ "LAD - Unknown Object C-Type", "lmp.error.lad_unknown_ctype",
-		  FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+		  FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_TRACE_LOCAL_TYPE],
 		{ "Local Trace Type", "lmp.trace.local_type", FT_UINT16, BASE_DEC,
-		  VALS(lmp_trace_type_str), 0x0, "", HFILL }},
+		  VALS(lmp_trace_type_str), 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TRACE_LOCAL_LEN],
 		{ "Local Trace Length", "lmp.trace.local_length", FT_UINT16, BASE_DEC,
-		  NULL, 0x0, "", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TRACE_LOCAL_MSG],
 		{ "Local Trace Message", "lmp.trace.local_msg", FT_STRING, BASE_NONE,
-		  NULL, 0x0, "", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TRACE_REMOTE_TYPE],
 		{ "Remote Trace Type", "lmp.trace.remote_type", FT_UINT16, BASE_DEC,
-		  VALS(lmp_trace_type_str), 0x0, "", HFILL }},
+		  VALS(lmp_trace_type_str), 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TRACE_REMOTE_LEN],
 		{ "Remote Trace Length", "lmp.trace.remote_length", FT_UINT16, BASE_DEC,
-		  NULL, 0x0, "", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_TRACE_REMOTE_MSG],
 		{ "Remote Trace Message", "lmp.trace.remote_msg", FT_STRING, BASE_NONE,
-		  NULL, 0x0, "", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_TRACE_REQ_TYPE],
 		{ "Trace Type", "lmp.trace_req.type", FT_UINT16, BASE_DEC,
-		  VALS(lmp_trace_type_str), 0x0, "", HFILL }},
+		  VALS(lmp_trace_type_str), 0x0, NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
 		{ "Service Config - Supported Signalling Protocols", 
-		"lmp.service_config.sp", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+		"lmp.service_config.sp", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
-	   { " RSVP is supported", "lmp.service_config.sp.rsvp", 
-		 FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+	   { "RSVP is supported", "lmp.service_config.sp.rsvp", 
+		 FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
 		{ "LDP is supported", "lmp.service_config.sp.ldp", 
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
 		{ "Client Port Service Attributes", "lmp.service_config.cpsa", 
-		  FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+		  FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
 		{ "Path/VC Overhead Transparency Supported", 
 		  "lmp.service_config.cpsa.path_overhead", 
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
 		{ "Line/MS Overhead Transparency Supported", 
 		  "lmp.service_config.cpsa.line_overhead", 
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
 		{ "Section/RS Overhead Transparency Supported", 
 		  "lmp.service_config.cpsa.section_overhead", 
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
 		{ "Contiguous Concatenation Types", "lmp.service_config.cct", 
-		  FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+		  FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
 		{ "Contiguous Concatenation Types Supported", 
 		  "lmp.service_config.cpsa.line_overhead", 
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC], 
 		{ "Minimum Number of Contiguously Concatenated Components", 
 		  "lmp.service_config.cpsa.min_ncc",
-		  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, 
+		  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, 
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC], 
 		{ "Maximum Number of Contiguously Concatenated Components", 
 		  "lmp.service_config.cpsa.max_ncc",
-		  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, 
+		  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, 
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC], 
 		{ "Maximum Number of Contiguously Concatenated Components", 
 		  "lmp.service_config.cpsa.min_nvc",
-		  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, 
+		  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, 
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC], 
 		{ "Minimum Number of Virtually Concatenated Components", 
 		  "lmp.service_config.cpsa.max_nvc",
-		  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+		  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID], 
 		{ "Local interface id of the client interface referred to", 
 		  "lmp.service_config.cpsa.local_ifid",
-		  FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}},
+		  FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
 		{ "Network Transparency Flags",
 		  "lmp.service_config.nsa.transparency",
-		  FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+		  FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
 		{ "Standard SOH/RSOH transparency supported",
 		  "lmp.service_config.nsa.transparency.soh",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
 		{ "Standard LOH/MSOH transparency supported",
 		  "lmp.service_config.nsa.transparency.loh",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
 		{ "TCM Monitoring", 
 		"lmp.service_config.nsa.tcm", 
-		  FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+		  FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
 		{ "TCM Monitoring Supported",
 		  "lmp.service_config.nsa.transparency.tcm",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
 		{ "Network Diversity Flags", 
 		"lmp.service_config.nsa.diversity", 
-		  FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+		  FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 	   
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
 		{ "Node diversity supported",
 		  "lmp.service_config.nsa.diversity.node",
-		  FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
 		{ "Link diversity supported",
 		  "lmp.service_config.nsa.diversity.link",
-		  FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
 		{ "SRLG diversity supported",
 		  "lmp.service_config.nsa.diversity.srlg",
-		  FT_BOOLEAN, 8, NULL, 0x04, "", HFILL}},
+		  FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}},
 
 	   {&lmp_filter[LMPF_VAL_LOCAL_DA_DCN_ADDR],
 		{ "Local DA DCN Address", "lmp.local_da_dcn_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_REMOTE_DA_DCN_ADDR],
 		{ "Remote DA DCN Address", "lmp.remote_da_dcn_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	   {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_NODE_ID],
 		{ "Node ID", "lmp.local_lad_node_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_AREA_ID],
 		{ "Area ID", "lmp.local_lad_area_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_TE_LINK_ID],
 		{ "TE Link ID", "lmp.local_lad_telink_id", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_COMPONENT_ID],
 		{ "Component Link ID", "lmp.local_lad_comp_id", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ID],
 		{ "SC PC ID", "lmp.local_lad_sc_pc_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ADDR],
 		{ "SC PC Address", "lmp.local_lad_sc_pc_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
-		{ "Subobject", "lmp.lad_info_subobj", FT_NONE, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+		{ "Subobject", "lmp.lad_info_subobj", FT_NONE, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
 		{ "SC PC Address", "lmp.lad_pri_area_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ID],
 		{ "SC PC Address", "lmp.lad_pri_rc_pc_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ADDR],
 		{ "SC PC Address", "lmp.lad_pri_rc_pc_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
 		{ "SC PC Address", "lmp.lad_sec_area_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ID],
 		{ "SC PC Address", "lmp.lad_sec_rc_pc_id", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ADDR],
 		{ "SC PC Address", "lmp.lad_sec_rc_pc_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
 		{ "Interface Switching Capability", "lmp.lad_switching", FT_UINT8, BASE_DEC,
-		  VALS(gmpls_switching_type_str), 0x0, "", HFILL }},
+		  VALS(gmpls_switching_type_str), 0x0, NULL, HFILL }},
 	   {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
 		{ "LSP Encoding Type", "lmp.lad_encoding", FT_UINT8, BASE_DEC,
-		  VALS(gmpls_lsp_enc_str), 0x0, "", HFILL }},
+		  VALS(gmpls_lsp_enc_str), 0x0, NULL, HFILL }},
 	};
 
     for (i=0; i<NUM_LMP_SUBTREES; i++) {