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

diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 47aceb8960..56d3803508 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -5135,16 +5135,16 @@ void proto_register_h248(void) {
   static hf_register_info hf[] = {
     { &hf_h248_mtpaddress_ni, {
       "NI", "h248.mtpaddress.ni", FT_UINT32, BASE_DEC,
-      NULL, 0, "NI", HFILL }},
+      NULL, 0, NULL, HFILL }},
     { &hf_h248_mtpaddress_pc, {
       "PC", "h248.mtpaddress.pc", FT_UINT32, BASE_DEC,
-      NULL, 0, "PC", HFILL }},
+      NULL, 0, NULL, HFILL }},
     { &hf_h248_pkg_name, {
       "Package", "h248.package_name", FT_UINT16, BASE_HEX,
-      VALS(package_name_vals), 0, "Package", HFILL }},
+      VALS(package_name_vals), 0, NULL, HFILL }},
     { &hf_248_pkg_param, {
       "Parameter ID", "h248.package_paramid", FT_UINT16, BASE_HEX,
-      NULL, 0, "Parameter ID", HFILL }},
+      NULL, 0, NULL, HFILL }},
     { &hf_h248_signal_code, {
       "Signal ID", "h248.package_signalid", FT_UINT16, BASE_HEX,
       NULL, 0, "Parameter ID", HFILL }},
@@ -5160,7 +5160,7 @@ void proto_register_h248(void) {
 	{ &hf_h248_pkg_bcp_BNCChar_PDU,
       { "BNCChar", "h248.package_bcp.BNCChar",
         FT_UINT32, BASE_DEC, VALS(gcp_term_types), 0,
-        "BNCChar", HFILL }},
+        NULL, HFILL }},
 
   { &hf_h248_error_code,
   { "errorCode", "h248.errorCode",
@@ -5173,32 +5173,32 @@ void proto_register_h248(void) {
   { &hf_h248_term_wild_type,
   { "Wildcard Mode", "h248.term.wildcard.mode",
       FT_UINT8, BASE_DEC, VALS(wildcard_modes), 0x80,
-      "", HFILL }},
+      NULL, HFILL }},
   { &hf_h248_term_wild_level,
   { "Wildcarding Level", "h248.term.wildcard.level",
       FT_UINT8, BASE_DEC, VALS(wildcard_levels), 0x40,
-      "", HFILL }},
+      NULL, HFILL }},
   { &hf_h248_term_wild_position,
   { "Wildcarding Position", "h248.term.wildcard.pos",
       FT_UINT8, BASE_DEC, NULL, 0x3F,
-      "", HFILL }},
+      NULL, HFILL }},
 
   { &hf_h248_no_pkg,
   { "Unknown Package", "h248.pkg.unknown",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_no_sig,
   { "Unknown Signal", "h248.pkg.unknown.sig",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_no_evt,
   { "Unknown Event", "h248.pkg.unknown.evt",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_param,
   { "Parameter", "h248.pkg.unknown.param",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_serviceChangeReasonStr,
       { "ServiceChangeReasonStr", "h248.serviceChangeReasonstr",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -5217,15 +5217,15 @@ void proto_register_h248(void) {
         "h248.Message", HFILL }},
     { &hf_h248_secParmIndex,
       { "secParmIndex", "h248.secParmIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SecurityParmIndex", HFILL }},
     { &hf_h248_seqNum,
       { "seqNum", "h248.seqNum",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SequenceNum", HFILL }},
     { &hf_h248_ad,
       { "ad", "h248.ad",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.AuthData", HFILL }},
     { &hf_h248_version,
       { "version", "h248.version",
@@ -5269,7 +5269,7 @@ void proto_register_h248(void) {
         "h248.PathName", HFILL }},
     { &hf_h248_mtpAddress,
       { "mtpAddress", "h248.mtpAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.MtpAddress", HFILL }},
     { &hf_h248_domName,
       { "name", "h248.name",
@@ -5421,7 +5421,7 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_15", HFILL }},
     { &hf_h248_emergency,
       { "emergency", "h248.emergency",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_topologyReq,
       { "topologyReq", "h248.topologyReq",
@@ -5433,7 +5433,7 @@ void proto_register_h248(void) {
         "h248.TopologyRequest", HFILL }},
     { &hf_h248_iepscallind_BOOL,
       { "iepscallind", "h248.iepscallind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.Iepscallind_BOOL", HFILL }},
     { &hf_h248_contextProp,
       { "contextProp", "h248.contextProp",
@@ -5481,11 +5481,11 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_15", HFILL }},
     { &hf_h248_selectemergency,
       { "selectemergency", "h248.selectemergency",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_selectiepscallind,
       { "selectiepscallind", "h248.selectiepscallind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_selectLogic,
       { "selectLogic", "h248.selectLogic",
@@ -5689,7 +5689,7 @@ void proto_register_h248(void) {
         "h248.AuditDescriptor", HFILL }},
     { &hf_h248_auditToken,
       { "auditToken", "h248.auditToken",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.T_auditToken", HFILL }},
     { &hf_h248_auditPropertyToken,
       { "auditPropertyToken", "h248.auditPropertyToken",
@@ -5793,7 +5793,7 @@ void proto_register_h248(void) {
         "h248.StreamMode", HFILL }},
     { &hf_h248_name,
       { "name", "h248.name",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_propertyParms,
       { "propertyParms", "h248.propertyParms",
@@ -5829,11 +5829,11 @@ void proto_register_h248(void) {
         "h248.RequestID", HFILL }},
     { &hf_h248_iAEDPkgdName,
       { "pkgdName", "h248.pkgdName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_iAEBDEventName,
       { "eventName", "h248.eventName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_indAudSignal,
       { "signal", "h248.signal",
@@ -5853,7 +5853,7 @@ void proto_register_h248(void) {
         "h248.IndAudSignal", HFILL }},
     { &hf_h248_iASignalName,
       { "signalName", "h248.signalName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_signalRequestID,
       { "signalRequestID", "h248.signalRequestID",
@@ -5861,15 +5861,15 @@ void proto_register_h248(void) {
         "h248.RequestID", HFILL }},
     { &hf_h248_digitMapName,
       { "digitMapName", "h248.digitMapName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.DigitMapName", HFILL }},
     { &hf_h248_iAStatName,
       { "statName", "h248.statName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_packageName,
       { "packageName", "h248.packageName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.Name", HFILL }},
     { &hf_h248_packageVersion,
       { "packageVersion", "h248.packageVersion",
@@ -5889,7 +5889,7 @@ void proto_register_h248(void) {
         "h248.ObservedEvent", HFILL }},
     { &hf_h248_eventName,
       { "eventName", "h248.eventName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.EventName", HFILL }},
     { &hf_h248_eventParList,
       { "eventParList", "h248.eventParList",
@@ -5905,7 +5905,7 @@ void proto_register_h248(void) {
         "h248.TimeNotation", HFILL }},
     { &hf_h248_eventParameterName,
       { "eventParameterName", "h248.eventParameterName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.EventParameterName", HFILL }},
     { &hf_h248_eventParamValue,
       { "eventParamValue", "h248.eventParamValue",
@@ -5921,15 +5921,15 @@ void proto_register_h248(void) {
         "h248.Relation", HFILL }},
     { &hf_h248_range,
       { "range", "h248.range",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_sublist,
       { "sublist", "h248.sublist",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_EventParamValues_item,
       { "EventParamValue", "h248.EventParamValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.EventParamValue", HFILL }},
     { &hf_h248_serviceChangeParms,
       { "serviceChangeParms", "h248.serviceChangeParms",
@@ -5949,11 +5949,11 @@ void proto_register_h248(void) {
         "h248.SEQUENCE_OF_WildcardField", HFILL }},
     { &hf_h248_wildcard_item,
       { "WildcardField", "h248.WildcardField",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.WildcardField", HFILL }},
     { &hf_h248_terminationId,
       { "id", "h248.id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.T_terminationId", HFILL }},
     { &hf_h248_TerminationIDList_item,
       { "TerminationID", "h248.TerminationID",
@@ -6001,11 +6001,11 @@ void proto_register_h248(void) {
         "h248.StreamMode", HFILL }},
     { &hf_h248_reserveValue,
       { "reserveValue", "h248.reserveValue",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_reserveGroup,
       { "reserveGroup", "h248.reserveGroup",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_propertyParms_01,
       { "propertyParms", "h248.propertyParms",
@@ -6017,7 +6017,7 @@ void proto_register_h248(void) {
         "h248.PropertyParm", HFILL }},
     { &hf_h248_propertyName,
       { "propertyName", "h248.propertyName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PropertyName", HFILL }},
     { &hf_h248_propertyParamValue,
       { "value", "h248.value",
@@ -6025,7 +6025,7 @@ void proto_register_h248(void) {
         "h248.SEQUENCE_OF_PropertyID", HFILL }},
     { &hf_h248_propertyParamValue_item,
       { "PropertyID", "h248.PropertyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PropertyID", HFILL }},
     { &hf_h248_propParm_extraInfo,
       { "extraInfo", "h248.extraInfo",
@@ -6105,7 +6105,7 @@ void proto_register_h248(void) {
         "h248.NULL", HFILL }},
     { &hf_h248_keepActive,
       { "keepActive", "h248.keepActive",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_eventDM,
       { "eventDM", "h248.eventDM",
@@ -6133,7 +6133,7 @@ void proto_register_h248(void) {
         "h248.SecondRequestedEvent", HFILL }},
     { &hf_h248_pkgdName,
       { "pkgdName", "h248.pkgdName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_secondaryEventAction,
       { "eventAction", "h248.eventAction",
@@ -6165,7 +6165,7 @@ void proto_register_h248(void) {
         "h248.Signal", HFILL }},
     { &hf_h248_signalName,
       { "signalName", "h248.signalName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SignalName", HFILL }},
     { &hf_h248_sigType,
       { "sigType", "h248.sigType",
@@ -6177,7 +6177,7 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_65535", HFILL }},
     { &hf_h248_notifyCompletion,
       { "notifyCompletion", "h248.notifyCompletion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.NotifyCompletion", HFILL }},
     { &hf_h248_sigParList,
       { "sigParList", "h248.sigParList",
@@ -6197,7 +6197,7 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_65535", HFILL }},
     { &hf_h248_sigParameterName,
       { "sigParameterName", "h248.sigParameterName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SigParameterName", HFILL }},
     { &hf_h248_value,
       { "value", "h248.value",
@@ -6209,7 +6209,7 @@ void proto_register_h248(void) {
         "h248.T_extraInfo", HFILL }},
     { &hf_h248_SigParamValues_item,
       { "SigParamValue", "h248.SigParamValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SigParamValue", HFILL }},
     { &hf_h248_mtl,
       { "mtl", "h248.mtl",
@@ -6289,7 +6289,7 @@ void proto_register_h248(void) {
         "h248.NULL", HFILL }},
     { &hf_h248_SCreasonValue_item,
       { "SCreasonValueOctetStr", "h248.SCreasonValueOctetStr",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SCreasonValueOctetStr", HFILL }},
     { &hf_h248_timestamp,
       { "timestamp", "h248.timestamp",
@@ -6309,7 +6309,7 @@ void proto_register_h248(void) {
         "h248.StatisticsParameter", HFILL }},
     { &hf_h248_statName,
       { "statName", "h248.statName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.StatName", HFILL }},
     { &hf_h248_statValue,
       { "statValue", "h248.statValue",
@@ -6321,7 +6321,7 @@ void proto_register_h248(void) {
         "h248.NonStandardIdentifier", HFILL }},
     { &hf_h248_data,
       { "data", "h248.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.OCTET_STRING", HFILL }},
     { &hf_h248_object,
       { "object", "h248.object",
@@ -6361,68 +6361,68 @@ void proto_register_h248(void) {
         "h248.IA5String_SIZE_8", HFILL }},
     { &hf_h248_Value_item,
       { "Value item", "h248.Value_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.OCTET_STRING", HFILL }},
     { &hf_h248_T_auditToken_muxToken,
       { "muxToken", "h248.muxToken",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_modemToken,
       { "modemToken", "h248.modemToken",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_mediaToken,
       { "mediaToken", "h248.mediaToken",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_eventsToken,
       { "eventsToken", "h248.eventsToken",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_signalsToken,
       { "signalsToken", "h248.signalsToken",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_digitMapToken,
       { "digitMapToken", "h248.digitMapToken",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_statsToken,
       { "statsToken", "h248.statsToken",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_observedEventsToken,
       { "observedEventsToken", "h248.observedEventsToken",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_packagesToken,
       { "packagesToken", "h248.packagesToken",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_eventBufferToken,
       { "eventBufferToken", "h248.eventBufferToken",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onTimeOut,
       { "onTimeOut", "h248.onTimeOut",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onInterruptByEvent,
       { "onInterruptByEvent", "h248.onInterruptByEvent",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr,
       { "onInterruptByNewSignalDescr", "h248.onInterruptByNewSignalDescr",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_otherReason,
       { "otherReason", "h248.otherReason",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onIteration,
       { "onIteration", "h248.onIteration",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-h248-hfarr.c ---*/
 #line 1427 "packet-h248-template.c"