From 6a5f291f884b58464a1b430752d4114b9629af16 Mon Sep 17 00:00:00 2001 From: daniel_peintner Date: Mon, 8 Jul 2019 14:46:11 +0000 Subject: [PATCH] feat: add "iso2" prefix to Document and Fragment structures/defines to avoid collisions if multiple codecs are used in parallel (e.g., iso1 and iso2) git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@117 d9f2db14-54d0-4bde-b00c-16405c910529 --- src/iso2/iso2EXIDatatypes.h | 140 ++++++++++++++--------------- src/iso2/iso2EXIDatatypesDecoder.c | 70 +++++++-------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/iso2/iso2EXIDatatypes.h b/src/iso2/iso2EXIDatatypes.h index 724685a..26e465c 100644 --- a/src/iso2/iso2EXIDatatypes.h +++ b/src/iso2/iso2EXIDatatypes.h @@ -2963,41 +2963,41 @@ struct iso2AnonType_V2G_Message { -#define EXIDocument_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIDocument_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIDocument_DigestValue_BYTES_SIZE 350 -#define EXIFragment_stringValue_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIFragment_PgenCounter_BYTES_SIZE 350 -#define EXIFragment_SalesTariffDescription_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,tariffDescriptionType is 32 */ -#define EXIFragment_SessionID_BYTES_SIZE 8 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,sessionIDType is 8 */ -#define EXIFragment_XPath_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIFragment_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIFragment_OEMProvisioningCert_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,certificateType is 800 */ -#define EXIFragment_P_BYTES_SIZE 350 -#define EXIFragment_Q_BYTES_SIZE 350 -#define EXIFragment_X509SubjectName_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIFragment_G_BYTES_SIZE 350 -#define EXIFragment_J_BYTES_SIZE 350 -#define EXIFragment_Y_BYTES_SIZE 350 -#define EXIFragment_DigestValue_BYTES_SIZE 350 -#define EXIFragment_EVCCID_BYTES_SIZE 6 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,evccIDType is 6 */ -#define EXIFragment_PGPKeyID_BYTES_SIZE 350 -#define EXIFragment_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIFragment_X509SKI_BYTES_SIZE 350 -#define EXIFragment_Certificate_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,certificateType is 800 */ -#define EXIFragment_Modulus_BYTES_SIZE 350 -#define EXIFragment_SigMeterReading_BYTES_SIZE 64 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,sigMeterReadingType is 64 */ -#define EXIFragment_Exponent_BYTES_SIZE 350 -#define EXIFragment_PGPKeyPacket_BYTES_SIZE 350 -#define EXIFragment_Seed_BYTES_SIZE 350 -#define EXIFragment_MeterID_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,meterIDType is 32 */ -#define EXIFragment_X509CRL_BYTES_SIZE 350 -#define EXIFragment_SPKISexp_BYTES_SIZE 350 -#define EXIFragment_X509Certificate_BYTES_SIZE 350 -#define EXIFragment_EVSEID_CHARACTERS_SIZE 37 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,evseIDType is 37 */ -#define EXIFragment_GenChallenge_BYTES_SIZE 16 /* XML schema facet length for urn:iso:15118:2:2016:MsgDataTypes,genChallengeType is 16 */ -#define EXIFragment_GAID_CHARACTERS_SIZE 50 + EXTRA_CHAR -#define EXIFragment_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIDocument_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIDocument_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIDocument_DigestValue_BYTES_SIZE 350 +#define iso2EXIFragment_stringValue_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIFragment_PgenCounter_BYTES_SIZE 350 +#define iso2EXIFragment_SalesTariffDescription_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,tariffDescriptionType is 32 */ +#define iso2EXIFragment_SessionID_BYTES_SIZE 8 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,sessionIDType is 8 */ +#define iso2EXIFragment_XPath_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIFragment_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIFragment_OEMProvisioningCert_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,certificateType is 800 */ +#define iso2EXIFragment_P_BYTES_SIZE 350 +#define iso2EXIFragment_Q_BYTES_SIZE 350 +#define iso2EXIFragment_X509SubjectName_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIFragment_G_BYTES_SIZE 350 +#define iso2EXIFragment_J_BYTES_SIZE 350 +#define iso2EXIFragment_Y_BYTES_SIZE 350 +#define iso2EXIFragment_DigestValue_BYTES_SIZE 350 +#define iso2EXIFragment_EVCCID_BYTES_SIZE 6 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,evccIDType is 6 */ +#define iso2EXIFragment_PGPKeyID_BYTES_SIZE 350 +#define iso2EXIFragment_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIFragment_X509SKI_BYTES_SIZE 350 +#define iso2EXIFragment_Certificate_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,certificateType is 800 */ +#define iso2EXIFragment_Modulus_BYTES_SIZE 350 +#define iso2EXIFragment_SigMeterReading_BYTES_SIZE 64 /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,sigMeterReadingType is 64 */ +#define iso2EXIFragment_Exponent_BYTES_SIZE 350 +#define iso2EXIFragment_PGPKeyPacket_BYTES_SIZE 350 +#define iso2EXIFragment_Seed_BYTES_SIZE 350 +#define iso2EXIFragment_MeterID_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,meterIDType is 32 */ +#define iso2EXIFragment_X509CRL_BYTES_SIZE 350 +#define iso2EXIFragment_SPKISexp_BYTES_SIZE 350 +#define iso2EXIFragment_X509Certificate_BYTES_SIZE 350 +#define iso2EXIFragment_EVSEID_CHARACTERS_SIZE 37 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2016:MsgDataTypes,evseIDType is 37 */ +#define iso2EXIFragment_GenChallenge_BYTES_SIZE 16 /* XML schema facet length for urn:iso:15118:2:2016:MsgDataTypes,genChallengeType is 16 */ +#define iso2EXIFragment_GAID_CHARACTERS_SIZE 50 + EXTRA_CHAR +#define iso2EXIFragment_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR /* Global elements of EXI Document */ @@ -3110,7 +3110,7 @@ struct iso2EXIDocument { struct iso2TransformType Transform ; struct iso2PGPDataType PGPData ; struct { - exi_string_character_t characters[EXIDocument_MgmtData_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIDocument_MgmtData_CHARACTERS_SIZE]; uint16_t charactersLen; } MgmtData ; struct iso2SignatureMethodType SignatureMethod ; @@ -3119,11 +3119,11 @@ struct iso2EXIDocument { struct iso2X509DataType X509Data ; struct iso2SignatureValueType SignatureValue ; struct { - exi_string_character_t characters[EXIDocument_KeyName_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIDocument_KeyName_CHARACTERS_SIZE]; uint16_t charactersLen; } KeyName ; struct { - uint8_t bytes[EXIDocument_DigestValue_BYTES_SIZE]; + uint8_t bytes[iso2EXIDocument_DigestValue_BYTES_SIZE]; uint16_t bytesLen; } DigestValue ; struct iso2SignedInfoType SignedInfo ; @@ -3283,7 +3283,7 @@ struct iso2EXIFragment { int16_t XCoordinate ; iso2EVCheckOutStatusType EVSECheckOutStatus ; struct { - exi_string_character_t characters[EXIFragment_stringValue_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_stringValue_CHARACTERS_SIZE]; uint16_t charactersLen; } stringValue ; int16_t RetryCounter ; @@ -3299,11 +3299,11 @@ struct iso2EXIFragment { struct iso2SAScheduleTupleType SAScheduleTuple ; uint16_t ServiceID ; struct { - uint8_t bytes[EXIFragment_PgenCounter_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_PgenCounter_BYTES_SIZE]; uint16_t bytesLen; } PgenCounter ; struct { - exi_string_character_t characters[EXIFragment_SalesTariffDescription_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_SalesTariffDescription_CHARACTERS_SIZE]; uint16_t charactersLen; } SalesTariffDescription ; struct iso2PhysicalValueType AngleGAtoVA ; @@ -3314,7 +3314,7 @@ struct iso2EXIFragment { struct iso2PGPDataType PGPData ; struct iso2PhysicalValueType EVSEMaximumChargePower ; struct { - uint8_t bytes[EXIFragment_SessionID_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_SessionID_BYTES_SIZE]; uint16_t bytesLen; } SessionID ; struct iso2PhysicalValueType EVSEEnergyToBeDelivered ; @@ -3324,7 +3324,7 @@ struct iso2EXIFragment { struct iso2PhysicalValueType EVSENominalVoltage ; struct iso2MagneticVectorType MagneticVector ; struct { - exi_string_character_t characters[EXIFragment_XPath_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_XPath_CHARACTERS_SIZE]; uint16_t charactersLen; } XPath ; struct iso2SignatureType Signature ; @@ -3341,7 +3341,7 @@ struct iso2EXIFragment { struct iso2FinePositioningSetupResType FinePositioningSetupRes ; struct iso2PMaxScheduleEntryType ProfileEntry ; struct { - exi_string_character_t characters[EXIFragment_MgmtData_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_MgmtData_CHARACTERS_SIZE]; uint16_t charactersLen; } MgmtData ; struct iso2CertificateChainType SAProvisioningCertificateChain ; @@ -3355,29 +3355,29 @@ struct iso2EXIFragment { struct iso2PhysicalValueType amount ; struct iso2PreChargeReqType PreChargeReq ; struct { - uint8_t bytes[EXIFragment_OEMProvisioningCert_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_OEMProvisioningCert_BYTES_SIZE]; uint16_t bytesLen; } OEMProvisioningCert ; uint32_t PackageIndex ; struct iso2PreChargeResType PreChargeRes ; struct { - uint8_t bytes[EXIFragment_P_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_P_BYTES_SIZE]; uint16_t bytesLen; } P ; struct { - uint8_t bytes[EXIFragment_Q_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_Q_BYTES_SIZE]; uint16_t bytesLen; } Q ; struct { - exi_string_character_t characters[EXIFragment_X509SubjectName_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_X509SubjectName_CHARACTERS_SIZE]; uint16_t charactersLen; } X509SubjectName ; struct { - uint8_t bytes[EXIFragment_G_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_G_BYTES_SIZE]; uint16_t bytesLen; } G ; struct { - uint8_t bytes[EXIFragment_J_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_J_BYTES_SIZE]; uint16_t bytesLen; } J ; struct iso2CertificateChainType ContractSignatureCertChain ; @@ -3386,25 +3386,25 @@ struct iso2EXIFragment { struct iso2PhysicalValueType EVMaximumChargeCurrent ; uint16_t AlignmentOffset ; struct { - uint8_t bytes[EXIFragment_Y_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_Y_BYTES_SIZE]; uint16_t bytesLen; } Y ; int8_t RemainingTimeToTargetSOC ; struct { - uint8_t bytes[EXIFragment_DigestValue_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_DigestValue_BYTES_SIZE]; uint16_t bytesLen; } DigestValue ; struct iso2SensorMeasurementsType SensorMeasurements ; struct iso2SalesTariffType SalesTariff ; struct { - uint8_t bytes[EXIFragment_EVCCID_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_EVCCID_BYTES_SIZE]; uint16_t bytesLen; } EVCCID ; struct iso2PhysicalValueType EVSEMaximumPower ; struct iso2TargetPositionType TargetOffset ; struct iso2ParameterSetType PowerDemandParameters ; struct { - uint8_t bytes[EXIFragment_PGPKeyID_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_PGPKeyID_BYTES_SIZE]; uint16_t bytesLen; } PGPKeyID ; struct iso2DisconnectChargingDeviceReqType DisconnectChargingDeviceReq ; @@ -3452,7 +3452,7 @@ struct iso2EXIFragment { struct iso2MV_EVSEFinePositioningParametersType MV_EVSEFinePositioningParameters ; iso2chargeProgressType ChargeProgress ; struct { - exi_string_character_t characters[EXIFragment_KeyName_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_KeyName_CHARACTERS_SIZE]; uint16_t charactersLen; } KeyName ; struct iso2PMaxScheduleType PMaxSchedule ; @@ -3465,14 +3465,14 @@ struct iso2EXIFragment { struct iso2PMaxScheduleEntryType PMaxScheduleEntry ; struct iso2SAScheduleListType SAScheduleList ; struct { - uint8_t bytes[EXIFragment_X509SKI_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_X509SKI_BYTES_SIZE]; uint16_t bytesLen; } X509SKI ; struct iso2PaymentOptionListType PaymentOptionList ; struct iso2ContractSignatureEncryptedPrivateKeyType ContractSignatureEncryptedPrivateKey ; struct iso2VehicleCheckInReqType VehicleCheckInReq ; struct { - uint8_t bytes[EXIFragment_Certificate_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_Certificate_BYTES_SIZE]; uint16_t bytesLen; } Certificate ; uint64_t CheckOutTime ; @@ -3492,7 +3492,7 @@ struct iso2EXIFragment { struct iso2CurrentDemandResType CurrentDemandRes ; struct iso2AC_EVBidirectionalParameterType AC_EVBidirectionalParameter ; struct { - uint8_t bytes[EXIFragment_Modulus_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_Modulus_BYTES_SIZE]; uint16_t bytesLen; } Modulus ; struct iso2SelectedServiceType SelectedEnergyTransferService ; @@ -3501,7 +3501,7 @@ struct iso2EXIFragment { struct iso2ChargeParameterDiscoveryReqType ChargeParameterDiscoveryReq ; struct iso2ChargeParameterDiscoveryResType ChargeParameterDiscoveryRes ; struct { - uint8_t bytes[EXIFragment_SigMeterReading_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_SigMeterReading_BYTES_SIZE]; uint16_t bytesLen; } SigMeterReading ; int8_t TargetSOC ; @@ -3516,7 +3516,7 @@ struct iso2EXIFragment { struct iso2EVSEFinePositioningSetupParametersType EVSEFinePositioningSetupParameters ; uint8_t EPriceLevel ; struct { - uint8_t bytes[EXIFragment_Exponent_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_Exponent_BYTES_SIZE]; uint16_t bytesLen; } Exponent ; struct iso2X509IssuerSerialType X509IssuerSerial ; @@ -3538,11 +3538,11 @@ struct iso2EXIFragment { struct iso2ServiceType Service ; struct iso2SignaturePropertyType SignatureProperty ; struct { - uint8_t bytes[EXIFragment_PGPKeyPacket_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_PGPKeyPacket_BYTES_SIZE]; uint16_t bytesLen; } PGPKeyPacket ; struct { - uint8_t bytes[EXIFragment_Seed_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_Seed_BYTES_SIZE]; uint16_t bytesLen; } Seed ; struct iso2LFA_EVFinePositioningSetupParametersType LFA_EVFinePositioningSetupParameters ; @@ -3563,7 +3563,7 @@ struct iso2EXIFragment { struct iso2DC_EVSEChargeParameterType DC_EVSEChargeParameter ; struct iso2MeteringReceiptReqType MeteringReceiptReq ; struct { - exi_string_character_t characters[EXIFragment_MeterID_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_MeterID_CHARACTERS_SIZE]; uint16_t charactersLen; } MeterID ; struct iso2MeteringReceiptResType MeteringReceiptRes ; @@ -3571,13 +3571,13 @@ struct iso2EXIFragment { uint8_t SalesTariffID ; struct iso2ServiceDiscoveryResType ServiceDiscoveryRes ; struct { - uint8_t bytes[EXIFragment_X509CRL_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_X509CRL_BYTES_SIZE]; uint16_t bytesLen; } X509CRL ; struct iso2MagneticVectorSetupType MagneticVectorSetup ; struct iso2DigestMethodType DigestMethod ; struct { - uint8_t bytes[EXIFragment_SPKISexp_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_SPKISexp_BYTES_SIZE]; uint16_t bytesLen; } SPKISexp ; uint64_t MeterReadingDischarged ; @@ -3589,7 +3589,7 @@ struct iso2EXIFragment { struct iso2SensorPackageType SensorPackage ; iso2EVCheckOutStatusType EVCheckOutStatus ; struct { - uint8_t bytes[EXIFragment_X509Certificate_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_X509Certificate_BYTES_SIZE]; uint16_t bytesLen; } X509Certificate ; struct iso2X509IssuerSerialType RootCertificateID ; @@ -3630,14 +3630,14 @@ struct iso2EXIFragment { iso2paymentOptionType SelectedPaymentOption ; struct iso2AnonType_V2G_Message V2G_Message ; struct { - exi_string_character_t characters[EXIFragment_EVSEID_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_EVSEID_CHARACTERS_SIZE]; uint16_t charactersLen; } EVSEID ; int64_t TMeter ; struct iso2SensorOrderListType SensorOrder ; struct iso2ServiceIDListType SupportedServiceIDs ; struct { - uint8_t bytes[EXIFragment_GenChallenge_BYTES_SIZE]; + uint8_t bytes[iso2EXIFragment_GenChallenge_BYTES_SIZE]; uint16_t bytesLen; } GenChallenge ; struct iso2EVFinePositioningParametersType EVFinePositioningParameters ; @@ -3648,7 +3648,7 @@ struct iso2EXIFragment { struct iso2ParameterType Parameter ; struct iso2WeldingDetectionResType WeldingDetectionRes ; struct { - exi_string_character_t characters[EXIFragment_GAID_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_GAID_CHARACTERS_SIZE]; uint16_t charactersLen; } GAID ; uint16_t SignalFrequency ; @@ -3664,7 +3664,7 @@ struct iso2EXIFragment { uint16_t CurrentRange ; struct iso2PhysicalValueType EVPresentReactivePower ; struct { - exi_string_character_t characters[EXIFragment_X509IssuerName_CHARACTERS_SIZE]; + exi_string_character_t characters[iso2EXIFragment_X509IssuerName_CHARACTERS_SIZE]; uint16_t charactersLen; } X509IssuerName ; struct iso2BodyBaseType V2GRequest ; diff --git a/src/iso2/iso2EXIDatatypesDecoder.c b/src/iso2/iso2EXIDatatypesDecoder.c index 067a17c..b7bd293 100644 --- a/src/iso2/iso2EXIDatatypesDecoder.c +++ b/src/iso2/iso2EXIDatatypesDecoder.c @@ -83004,7 +83004,7 @@ int decode_iso2ExiDocument(bitstream_t* stream, struct iso2EXIDocument* exiDoc) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiDoc->DigestValue.bytesLen); if (errn == 0) { - errn = (exiDoc->DigestValue.bytesLen) <= EXIDocument_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiDoc->DigestValue.bytesLen) <= iso2EXIDocument_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiDoc->DigestValue.bytesLen, exiDoc->DigestValue.bytes); @@ -83101,7 +83101,7 @@ int decode_iso2ExiDocument(bitstream_t* stream, struct iso2EXIDocument* exiDoc) if (errn == 0) { if (exiDoc->KeyName.charactersLen >= 2) { exiDoc->KeyName.charactersLen = (uint16_t)(exiDoc->KeyName.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiDoc->KeyName.charactersLen, exiDoc->KeyName.characters, EXIDocument_KeyName_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiDoc->KeyName.charactersLen, exiDoc->KeyName.characters, iso2EXIDocument_KeyName_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -83174,7 +83174,7 @@ int decode_iso2ExiDocument(bitstream_t* stream, struct iso2EXIDocument* exiDoc) if (errn == 0) { if (exiDoc->MgmtData.charactersLen >= 2) { exiDoc->MgmtData.charactersLen = (uint16_t)(exiDoc->MgmtData.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiDoc->MgmtData.charactersLen, exiDoc->MgmtData.characters, EXIDocument_MgmtData_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiDoc->MgmtData.charactersLen, exiDoc->MgmtData.characters, iso2EXIDocument_MgmtData_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -83613,7 +83613,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->Certificate.bytesLen); if (errn == 0) { - errn = (exiFrag->Certificate.bytesLen) <= EXIFragment_Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->Certificate.bytesLen) <= iso2EXIFragment_Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->Certificate.bytesLen, exiFrag->Certificate.bytes); @@ -83869,7 +83869,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->DigestValue.bytesLen); if (errn == 0) { - errn = (exiFrag->DigestValue.bytesLen) <= EXIFragment_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->DigestValue.bytesLen) <= iso2EXIFragment_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->DigestValue.bytesLen, exiFrag->DigestValue.bytes); @@ -83933,7 +83933,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->EVCCID.bytesLen); if (errn == 0) { - errn = (exiFrag->EVCCID.bytesLen) <= EXIFragment_EVCCID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->EVCCID.bytesLen) <= iso2EXIFragment_EVCCID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->EVCCID.bytesLen, exiFrag->EVCCID.bytes); @@ -84274,7 +84274,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->EVSEID.charactersLen >= 2) { exiFrag->EVSEID.charactersLen = (uint16_t)(exiFrag->EVSEID.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->EVSEID.charactersLen, exiFrag->EVSEID.characters, EXIFragment_EVSEID_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->EVSEID.charactersLen, exiFrag->EVSEID.characters, iso2EXIFragment_EVSEID_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -84633,7 +84633,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->G.bytesLen); if (errn == 0) { - errn = (exiFrag->G.bytesLen) <= EXIFragment_G_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->G.bytesLen) <= iso2EXIFragment_G_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->G.bytesLen, exiFrag->G.bytes); @@ -84655,7 +84655,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->GAID.charactersLen >= 2) { exiFrag->GAID.charactersLen = (uint16_t)(exiFrag->GAID.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->GAID.charactersLen, exiFrag->GAID.characters, EXIFragment_GAID_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->GAID.charactersLen, exiFrag->GAID.characters, iso2EXIFragment_GAID_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -84676,7 +84676,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->GenChallenge.bytesLen); if (errn == 0) { - errn = (exiFrag->GenChallenge.bytesLen) <= EXIFragment_GenChallenge_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->GenChallenge.bytesLen) <= iso2EXIFragment_GenChallenge_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->GenChallenge.bytesLen, exiFrag->GenChallenge.bytes); @@ -84744,7 +84744,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->J.bytesLen); if (errn == 0) { - errn = (exiFrag->J.bytesLen) <= EXIFragment_J_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->J.bytesLen) <= iso2EXIFragment_J_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->J.bytesLen, exiFrag->J.bytes); @@ -84771,7 +84771,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->KeyName.charactersLen >= 2) { exiFrag->KeyName.charactersLen = (uint16_t)(exiFrag->KeyName.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->KeyName.charactersLen, exiFrag->KeyName.characters, EXIFragment_KeyName_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->KeyName.charactersLen, exiFrag->KeyName.characters, iso2EXIFragment_KeyName_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -84893,7 +84893,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->MeterID.charactersLen >= 2) { exiFrag->MeterID.charactersLen = (uint16_t)(exiFrag->MeterID.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->MeterID.charactersLen, exiFrag->MeterID.characters, EXIFragment_MeterID_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->MeterID.charactersLen, exiFrag->MeterID.characters, iso2EXIFragment_MeterID_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -84973,7 +84973,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->MgmtData.charactersLen >= 2) { exiFrag->MgmtData.charactersLen = (uint16_t)(exiFrag->MgmtData.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->MgmtData.charactersLen, exiFrag->MgmtData.characters, EXIFragment_MgmtData_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->MgmtData.charactersLen, exiFrag->MgmtData.characters, iso2EXIFragment_MgmtData_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -85019,7 +85019,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->Modulus.bytesLen); if (errn == 0) { - errn = (exiFrag->Modulus.bytesLen) <= EXIFragment_Modulus_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->Modulus.bytesLen) <= iso2EXIFragment_Modulus_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->Modulus.bytesLen, exiFrag->Modulus.bytes); @@ -85098,7 +85098,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->OEMProvisioningCert.bytesLen); if (errn == 0) { - errn = (exiFrag->OEMProvisioningCert.bytesLen) <= EXIFragment_OEMProvisioningCert_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->OEMProvisioningCert.bytesLen) <= iso2EXIFragment_OEMProvisioningCert_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->OEMProvisioningCert.bytesLen, exiFrag->OEMProvisioningCert.bytes); @@ -85138,7 +85138,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->P.bytesLen); if (errn == 0) { - errn = (exiFrag->P.bytesLen) <= EXIFragment_P_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->P.bytesLen) <= iso2EXIFragment_P_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->P.bytesLen, exiFrag->P.bytes); @@ -85163,7 +85163,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->PGPKeyID.bytesLen); if (errn == 0) { - errn = (exiFrag->PGPKeyID.bytesLen) <= EXIFragment_PGPKeyID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->PGPKeyID.bytesLen) <= iso2EXIFragment_PGPKeyID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->PGPKeyID.bytesLen, exiFrag->PGPKeyID.bytes); @@ -85183,7 +85183,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->PGPKeyPacket.bytesLen); if (errn == 0) { - errn = (exiFrag->PGPKeyPacket.bytesLen) <= EXIFragment_PGPKeyPacket_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->PGPKeyPacket.bytesLen) <= iso2EXIFragment_PGPKeyPacket_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->PGPKeyPacket.bytesLen, exiFrag->PGPKeyPacket.bytes); @@ -85346,7 +85346,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->PgenCounter.bytesLen); if (errn == 0) { - errn = (exiFrag->PgenCounter.bytesLen) <= EXIFragment_PgenCounter_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->PgenCounter.bytesLen) <= iso2EXIFragment_PgenCounter_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->PgenCounter.bytesLen, exiFrag->PgenCounter.bytes); @@ -85406,7 +85406,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->Q.bytesLen); if (errn == 0) { - errn = (exiFrag->Q.bytesLen) <= EXIFragment_Q_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->Q.bytesLen) <= iso2EXIFragment_Q_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->Q.bytesLen, exiFrag->Q.bytes); @@ -85599,7 +85599,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->SPKISexp.bytesLen); if (errn == 0) { - errn = (exiFrag->SPKISexp.bytesLen) <= EXIFragment_SPKISexp_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->SPKISexp.bytesLen) <= iso2EXIFragment_SPKISexp_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->SPKISexp.bytesLen, exiFrag->SPKISexp.bytes); @@ -85626,7 +85626,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->SalesTariffDescription.charactersLen >= 2) { exiFrag->SalesTariffDescription.charactersLen = (uint16_t)(exiFrag->SalesTariffDescription.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->SalesTariffDescription.charactersLen, exiFrag->SalesTariffDescription.characters, EXIFragment_SalesTariffDescription_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->SalesTariffDescription.charactersLen, exiFrag->SalesTariffDescription.characters, iso2EXIFragment_SalesTariffDescription_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -85667,7 +85667,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->Seed.bytesLen); if (errn == 0) { - errn = (exiFrag->Seed.bytesLen) <= EXIFragment_Seed_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->Seed.bytesLen) <= iso2EXIFragment_Seed_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->Seed.bytesLen, exiFrag->Seed.bytes); @@ -85829,7 +85829,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->SessionID.bytesLen); if (errn == 0) { - errn = (exiFrag->SessionID.bytesLen) <= EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->SessionID.bytesLen) <= iso2EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->SessionID.bytesLen, exiFrag->SessionID.bytes); @@ -85849,7 +85849,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->SessionID.bytesLen); if (errn == 0) { - errn = (exiFrag->SessionID.bytesLen) <= EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->SessionID.bytesLen) <= iso2EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->SessionID.bytesLen, exiFrag->SessionID.bytes); @@ -85889,7 +85889,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->SigMeterReading.bytesLen); if (errn == 0) { - errn = (exiFrag->SigMeterReading.bytesLen) <= EXIFragment_SigMeterReading_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->SigMeterReading.bytesLen) <= iso2EXIFragment_SigMeterReading_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->SigMeterReading.bytesLen, exiFrag->SigMeterReading.bytes); @@ -86163,7 +86163,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->X509CRL.bytesLen); if (errn == 0) { - errn = (exiFrag->X509CRL.bytesLen) <= EXIFragment_X509CRL_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->X509CRL.bytesLen) <= iso2EXIFragment_X509CRL_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->X509CRL.bytesLen, exiFrag->X509CRL.bytes); @@ -86183,7 +86183,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->X509Certificate.bytesLen); if (errn == 0) { - errn = (exiFrag->X509Certificate.bytesLen) <= EXIFragment_X509Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->X509Certificate.bytesLen) <= iso2EXIFragment_X509Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->X509Certificate.bytesLen, exiFrag->X509Certificate.bytes); @@ -86210,7 +86210,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->X509IssuerName.charactersLen >= 2) { exiFrag->X509IssuerName.charactersLen = (uint16_t)(exiFrag->X509IssuerName.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->X509IssuerName.charactersLen, exiFrag->X509IssuerName.characters, EXIFragment_X509IssuerName_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->X509IssuerName.charactersLen, exiFrag->X509IssuerName.characters, iso2EXIFragment_X509IssuerName_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -86236,7 +86236,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->X509SKI.bytesLen); if (errn == 0) { - errn = (exiFrag->X509SKI.bytesLen) <= EXIFragment_X509SKI_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->X509SKI.bytesLen) <= iso2EXIFragment_X509SKI_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->X509SKI.bytesLen, exiFrag->X509SKI.bytes); @@ -86272,7 +86272,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->X509SubjectName.charactersLen >= 2) { exiFrag->X509SubjectName.charactersLen = (uint16_t)(exiFrag->X509SubjectName.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->X509SubjectName.charactersLen, exiFrag->X509SubjectName.characters, EXIFragment_X509SubjectName_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->X509SubjectName.charactersLen, exiFrag->X509SubjectName.characters, iso2EXIFragment_X509SubjectName_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -86309,7 +86309,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->XPath.charactersLen >= 2) { exiFrag->XPath.charactersLen = (uint16_t)(exiFrag->XPath.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->XPath.charactersLen, exiFrag->XPath.characters, EXIFragment_XPath_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->XPath.charactersLen, exiFrag->XPath.characters, iso2EXIFragment_XPath_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED; @@ -86330,7 +86330,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if(eventCode == 0) { errn = decodeUnsignedInteger16(stream, &exiFrag->Y.bytesLen); if (errn == 0) { - errn = (exiFrag->Y.bytesLen) <= EXIFragment_Y_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; + errn = (exiFrag->Y.bytesLen) <= iso2EXIFragment_Y_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER; } if (errn == 0) { errn = decodeBytes(stream, exiFrag->Y.bytesLen, exiFrag->Y.bytes); @@ -86500,7 +86500,7 @@ int decode_iso2ExiFragment(bitstream_t* stream, struct iso2EXIFragment* exiFrag) if (errn == 0) { if (exiFrag->stringValue.charactersLen >= 2) { exiFrag->stringValue.charactersLen = (uint16_t)(exiFrag->stringValue.charactersLen - 2); /* string table miss */ - errn = decodeCharacters(stream, exiFrag->stringValue.charactersLen, exiFrag->stringValue.characters, EXIFragment_stringValue_CHARACTERS_SIZE); + errn = decodeCharacters(stream, exiFrag->stringValue.charactersLen, exiFrag->stringValue.characters, iso2EXIFragment_stringValue_CHARACTERS_SIZE); } else { /* string table hit */ errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;