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

diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index a6cfedd042..595b04f0a1 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -902,7 +902,7 @@ proto_register_charging_ase(void)
         "charging_ase.StopCharging", HFILL }},
     { &hf_charging_ase_acknowledgementIndicators,
       { "acknowledgementIndicators", "charging_ase.acknowledgementIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_acknowledgementIndicators", HFILL }},
     { &hf_charging_ase_extensions,
       { "extensions", "charging_ase.extensions",
@@ -922,7 +922,7 @@ proto_register_charging_ase(void)
         "charging_ase.ChargingReferenceIdentification", HFILL }},
     { &hf_charging_ase_chargingControlIndicators,
       { "chargingControlIndicators", "charging_ase.chargingControlIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.ChargingControlIndicators", HFILL }},
     { &hf_charging_ase_addOncharge,
       { "addOncharge", "charging_ase.addOncharge",
@@ -934,7 +934,7 @@ proto_register_charging_ase(void)
         "charging_ase.CurrencyFactorScale", HFILL }},
     { &hf_charging_ase_addOnChargePulse,
       { "addOnChargePulse", "charging_ase.addOnChargePulse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_currency,
       { "currency", "charging_ase.currency",
@@ -970,15 +970,15 @@ proto_register_charging_ase(void)
         "charging_ase.TariffDuration", HFILL }},
     { &hf_charging_ase_subTariffControl,
       { "subTariffControl", "charging_ase.subTariffControl",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.SubTariffControl", HFILL }},
     { &hf_charging_ase_pulseUnits,
       { "pulseUnits", "charging_ase.pulseUnits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_chargeUnitTimeInterval,
       { "chargeUnitTimeInterval", "charging_ase.chargeUnitTimeInterval",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.ChargeUnitTimeInterval", HFILL }},
     { &hf_charging_ase_currencyFactor,
       { "currencyFactor", "charging_ase.currencyFactor",
@@ -1010,7 +1010,7 @@ proto_register_charging_ase(void)
         "charging_ase.NetworkIdentification", HFILL }},
     { &hf_charging_ase_stopIndicators,
       { "stopIndicators", "charging_ase.stopIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_stopIndicators", HFILL }},
     { &hf_charging_ase_currentTariffCurrency,
       { "currentTariffCurrency", "charging_ase.currentTariffCurrency",
@@ -1026,7 +1026,7 @@ proto_register_charging_ase(void)
         "charging_ase.TariffCurrencyFormat", HFILL }},
     { &hf_charging_ase_tariffSwitchoverTime,
       { "tariffSwitchoverTime", "charging_ase.tariffSwitchoverTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.TariffSwitchoverTime", HFILL }},
     { &hf_charging_ase_communicationChargeSequenceCurrency,
       { "communicationChargeSequenceCurrency", "charging_ase.communicationChargeSequenceCurrency",
@@ -1038,7 +1038,7 @@ proto_register_charging_ase(void)
         "charging_ase.CommunicationChargeCurrency", HFILL }},
     { &hf_charging_ase_tariffControlIndicators,
       { "tariffControlIndicators", "charging_ase.tariffControlIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_tariffControlIndicators", HFILL }},
     { &hf_charging_ase_callAttemptChargeCurrency,
       { "callAttemptChargeCurrency", "charging_ase.callAttemptChargeCurrency",
@@ -1070,15 +1070,15 @@ proto_register_charging_ase(void)
         "charging_ase.CommunicationChargePulse", HFILL }},
     { &hf_charging_ase_tariffControlIndicators_01,
       { "tariffControlIndicators", "charging_ase.tariffControlIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_tariffControlIndicators_01", HFILL }},
     { &hf_charging_ase_callAttemptChargePulse,
       { "callAttemptChargePulse", "charging_ase.callAttemptChargePulse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_callSetupChargePulse,
       { "callSetupChargePulse", "charging_ase.callSetupChargePulse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_networkIdentification,
       { "networkIdentification", "charging_ase.networkIdentification",
@@ -1091,35 +1091,35 @@ proto_register_charging_ase(void)
     { &hf_charging_ase_T_acknowledgementIndicators_accepted,
       { "accepted", "charging_ase.accepted",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_subscriberCharge,
       { "subscriberCharge", "charging_ase.subscriberCharge",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff,
       { "immediateChangeOfActuallyAppliedTariff", "charging_ase.immediateChangeOfActuallyAppliedTariff",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_delayUntilStart,
       { "delayUntilStart", "charging_ase.delayUntilStart",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_T_stopIndicators_callAttemptChargesApplicable,
       { "callAttemptChargesApplicable", "charging_ase.callAttemptChargesApplicable",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_SubTariffControl_oneTimeCharge,
       { "oneTimeCharge", "charging_ase.oneTimeCharge",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff,
       { "non-cyclicTariff", "charging_ase.non-cyclicTariff",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff,
       { "non-cyclicTariff", "charging_ase.non-cyclicTariff",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-charging_ase-hfarr.c ---*/
 #line 85 "packet-charging_ase-template.c"