From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770

1 files changed, 69 insertions, 69 deletions

diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 2ceff64b10..1099ca4143 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -3414,124 +3414,124 @@ proto_register_megaco(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_megaco_audititem,
-		{ " Audit Item", "megaco.audititem", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Identity of item to be audited ", HFILL }},
+		{ "Audit Item", "megaco.audititem", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Identity of item to be audited", HFILL }},
 		{ &hf_megaco_audit_descriptor,
-		{ "Audit Descriptor", "megaco.audit", FT_NONE, BASE_DEC, NULL, 0x0,
-		"Audit Descriptor of the megaco Command ", HFILL }},
+		{ "Audit Descriptor", "megaco.audit", FT_NONE, BASE_NONE, NULL, 0x0,
+		"Audit Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_command_line,
-		{ "Command line", "megaco.command_line", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Commands of this message ", HFILL }},
+		{ "Command line", "megaco.command_line", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Commands of this message", HFILL }},
 		{ &hf_megaco_command,
-		{ "Command", "megaco.command", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Command of this message ", HFILL }},
+		{ "Command", "megaco.command", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Command of this message", HFILL }},
 		{ &hf_megaco_Context,
-		{ "Context", "megaco.context", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Context ID of this massage ", HFILL }},
+		{ "Context", "megaco.context", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Context ID of this massage", HFILL }},
 		{ &hf_megaco_digitmap_descriptor,
-		{ "DigitMap Descriptor", "megaco.digitmap", FT_STRING, BASE_DEC, NULL, 0x0,
-		"DigitMap Descriptor of the megaco Command ", HFILL }},
+		{ "DigitMap Descriptor", "megaco.digitmap", FT_STRING, BASE_NONE, NULL, 0x0,
+		"DigitMap Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_error_descriptor,
-		{ "ERROR Descriptor", "megaco.error", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Error Descriptor of the megaco Command ", HFILL }},
+		{ "ERROR Descriptor", "megaco.error", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Error Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_error_Frame,
-		{ "ERROR frame", "megaco.error_frame", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Syntax error ", HFILL }},
+		{ "ERROR frame", "megaco.error_frame", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Syntax error", HFILL }},
 		{ &hf_megaco_Event_Buffer_Control,
-		{ "Event Buffer Control", "megaco.eventbuffercontrol", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Event Buffer Control", "megaco.eventbuffercontrol", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Event Buffer Control in Termination State Descriptor", HFILL }},
 		{ &hf_megaco_events_descriptor,
-		{ "Events Descriptor", "megaco.events", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Events Descriptor of the megaco Command ", HFILL }},
+		{ "Events Descriptor", "megaco.events", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Events Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_Local_descriptor,
-		{ "Local Descriptor", "megaco.localdescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Local Descriptor in Media Descriptor ", HFILL }},
+		{ "Local Descriptor", "megaco.localdescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Local Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_LocalControl_descriptor,
-		{ "Local Control Descriptor", "megaco.localcontroldescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Local Control Descriptor in Media Descriptor ", HFILL }},
+		{ "Local Control Descriptor", "megaco.localcontroldescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Local Control Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_media_descriptor,
-		{ "Media Descriptor", "megaco.media", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Media Descriptor of the megaco Command ", HFILL }},
+		{ "Media Descriptor", "megaco.media", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Media Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_modem_descriptor,
-		{ "Modem Descriptor", "megaco.modem", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Modem Descriptor of the megaco Command ", HFILL }},
+		{ "Modem Descriptor", "megaco.modem", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Modem Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_mode,
-		{ "Mode", "megaco.mode", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Mode", "megaco.mode", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Mode  sendonly/receiveonly/inactive/loopback", HFILL }},
 		{ &hf_megaco_multiplex_descriptor,
-		{ "Multiplex Descriptor", "megaco.multiplex", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Multiplex Descriptor of the megaco Command ", HFILL }},
+		{ "Multiplex Descriptor", "megaco.multiplex", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Multiplex Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_observedevents_descriptor,
-		{ "Observed Events Descriptor", "megaco.observedevents", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Observed Events Descriptor of the megaco Command ", HFILL }},
+		{ "Observed Events Descriptor", "megaco.observedevents", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Observed Events Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_packages_descriptor,
-		{ "Packages Descriptor", "megaco.packagesdescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Packages Descriptor", HFILL }},
+		{ "Packages Descriptor", "megaco.packagesdescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_pkgdname,
-		{ "pkgdName", "megaco.pkgdname", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "pkgdName", "megaco.pkgdname", FT_STRING, BASE_NONE, NULL, 0x0,
 		"PackageName SLASH ItemID", HFILL }},
 		{ &hf_megaco_Remote_descriptor,
-		{ "Remote Descriptor", "megaco.remotedescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Remote Descriptor in Media Descriptor ", HFILL }},
+		{ "Remote Descriptor", "megaco.remotedescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Remote Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_reserve_group,
-		{ "Reserve Group", "megaco.reservegroup", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Reserve Group", "megaco.reservegroup", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Reserve Group on or off", HFILL }},
 		{ &hf_megaco_h324_muxtbl_in,
-		{ "h324/muxtbl_in", "megaco.h324_muxtbl_in", FT_STRING, BASE_DEC, NULL, 0x0,
-		"h324/muxtbl_in", HFILL }},
+		{ "h324/muxtbl_in", "megaco.h324_muxtbl_in", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_h324_muxtbl_out,
-		{ "h324/muxtbl_out", "megaco.h324_muxtbl_out", FT_STRING, BASE_DEC, NULL, 0x0,
-		"h324/muxtbl_out", HFILL }},
+		{ "h324/muxtbl_out", "megaco.h324_muxtbl_out", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_ds_dscp,
-		{ "ds/dscp", "megaco.ds_dscp", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "ds/dscp", "megaco.ds_dscp", FT_STRING, BASE_NONE, NULL, 0x0,
 		"ds/dscp Differentiated Services Code Point", HFILL }},
 		{ &hf_megaco_h324_h223capr,
-		{ "h324/h223capr", "megaco._h324_h223capr", FT_STRING, BASE_DEC, NULL, 0x0,
-		"h324/h223capr", HFILL }},
+		{ "h324/h223capr", "megaco._h324_h223capr", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_reserve_value,
-		{ "Reserve Value", "megaco.reservevalue", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Reserve Value", "megaco.reservevalue", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Reserve Value on or off", HFILL }},
 		{ &hf_megaco_requestid,
-		{ "RequestID", "megaco.requestid", FT_STRING, BASE_DEC, NULL, 0x0,
-		"RequestID in Events or Observedevents Descriptor ", HFILL }},
+		{ "RequestID", "megaco.requestid", FT_STRING, BASE_NONE, NULL, 0x0,
+		"RequestID in Events or Observedevents Descriptor", HFILL }},
 		{ &hf_megaco_servicechange_descriptor,
-		{ "Service Change Descriptor", "megaco.servicechange", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Service Change Descriptor of the megaco Command ", HFILL }},
+		{ "Service Change Descriptor", "megaco.servicechange", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Service Change Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_Service_State,
-		{ "Service State", "megaco.servicestates", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Service State", "megaco.servicestates", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Service States in Termination State Descriptor", HFILL }},
 		{ &hf_megaco_signal_descriptor,
-		{ "Signal Descriptor", "megaco.signal", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Signal Descriptor of the megaco Command ", HFILL }},
+		{ "Signal Descriptor", "megaco.signal", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Signal Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_statistics_descriptor,
-		{ "Statistics Descriptor", "megaco.statistics", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Statistics Descriptor of the megaco Command ", HFILL }},
+		{ "Statistics Descriptor", "megaco.statistics", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Statistics Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_streamid,
-		{ "StreamID", "megaco.streamid", FT_STRING, BASE_DEC, NULL, 0x0,
-		"StreamID in the Media Descriptor ", HFILL }},
+		{ "StreamID", "megaco.streamid", FT_STRING, BASE_NONE, NULL, 0x0,
+		"StreamID in the Media Descriptor", HFILL }},
 		{ &hf_megaco_termid,
-		{ "Termination ID", "megaco.termid", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Termination ID of this Command ", HFILL }},
+		{ "Termination ID", "megaco.termid", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Termination ID of this Command", HFILL }},
 		{ &hf_megaco_TerminationState_descriptor,
-		{ "Termination State Descriptor", "megaco.terminationstate", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Termination State Descriptor in Media Descriptor ", HFILL }},
+		{ "Termination State Descriptor", "megaco.terminationstate", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Termination State Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_topology_descriptor,
-		{ "Topology Descriptor", "megaco.topology", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Topology Descriptor of the megaco Command ", HFILL }},
+		{ "Topology Descriptor", "megaco.topology", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Topology Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_transaction,
-		{ "Transaction", "megaco.transaction", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Transaction", "megaco.transaction", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Message Originator", HFILL }},
 		{ &hf_megaco_transid,
-		{ "Transaction ID", "megaco.transid", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Transaction ID", "megaco.transid", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Transaction ID of this message", HFILL }},
 		{ &hf_megaco_mId,
-		{ "MediagatewayID", "megaco.mId", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "MediagatewayID", "megaco.mId", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Mediagateway ID", HFILL }},
 		{ &hf_megaco_version,
-		{ "Version", "megaco.version", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Version", HFILL }},
+		{ "Version", "megaco.version", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_h245,
-		{ "h245", "megaco.h245", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "h245", "megaco.h245", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Embedded H.245 message", HFILL }},
 		{ &hf_megaco_h223Capability,
  		{ "h223Capability", "megaco.h245.h223Capability", FT_NONE, BASE_NONE, NULL, 0,