intl_builtin.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | intl_builtin.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 1680 | skipping to change at line 1680 | |||
ULONG INTL_builtin_setup_attributes(const ASCII* textTypeName, const ASCII* char SetName, | ULONG INTL_builtin_setup_attributes(const ASCII* textTypeName, const ASCII* char SetName, | |||
const ASCII* configInfo, ULONG srcLen, const UCHAR* src, ULONG dstLen, UC HAR* dst) | const ASCII* configInfo, ULONG srcLen, const UCHAR* src, ULONG dstLen, UC HAR* dst) | |||
{ | { | |||
// We should better mark what's from ICU in intlnames.h, but this file is | // We should better mark what's from ICU in intlnames.h, but this file is | |||
// currently a nightmare. | // currently a nightmare. | |||
// It should declare an array to be used in others places instead of use | // It should declare an array to be used in others places instead of use | |||
// the preprocessor, but this is a task for another day. | // the preprocessor, but this is a task for another day. | |||
if (strstr(textTypeName, "UNICODE") && strcmp(textTypeName, "UNICODE_FSS" ) != 0) | if (strstr(textTypeName, "UNICODE") && strcmp(textTypeName, "UNICODE_FSS" ) != 0) | |||
{ | { | |||
Firebird::AutoPtr<charset, Jrd::CharSet::Delete> cs(FB_NEW charse t); | Firebird::AutoPtr<charset> cs(FB_NEW charset); | |||
memset(cs, 0, sizeof(*cs)); | memset(cs, 0, sizeof(*cs)); | |||
// test if that charset exists | // test if that charset exists | |||
if (!INTL_builtin_lookup_charset(cs, charSetName, configInfo)) | if (!INTL_builtin_lookup_charset(cs, charSetName, configInfo)) | |||
return INTL_BAD_STR_LENGTH; | return INTL_BAD_STR_LENGTH; | |||
const Firebird::string specificAttributes((const char*) src, srcL en); | const Firebird::string specificAttributes((const char*) src, srcL en); | |||
Firebird::string newSpecificAttributes = specificAttributes; | Firebird::string newSpecificAttributes = specificAttributes; | |||
if (IntlUtil::setupIcuAttributes(cs, specificAttributes, configIn fo, newSpecificAttributes)) | if (IntlUtil::setupIcuAttributes(cs, specificAttributes, configIn fo, newSpecificAttributes)) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |