firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Fix the merge

Browse Source
This commit is contained in:
asfernandes 2008-01-16 14:01:24 +00:00
parent a4fbbbf0d1
commit c64dd8d819
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jrd/TextType.cpp
View File

@ -240,7 +240,7 @@ USHORT TextType::string_to_key(USHORT srcLen,
if (getCharSet()->isMultiByte()) if (getCharSet()->isMultiByte())
{ {
dstLen = UnicodeUtil::utf16ToKey(srcLen, reinterpret_cast<const USHORT*>(src), dstLen = UnicodeUtil::utf16ToKey(srcLen, Firebird::Aligner<USHORT>(src, srcLen),
dstLen, dst, key_type); dstLen, dst, key_type);
} }
else else
@ -321,8 +321,8 @@ SSHORT TextType::compare(ULONG len1,
if (getCharSet()->isMultiByte()) if (getCharSet()->isMultiByte())
{ {
INTL_BOOL error_flag; INTL_BOOL error_flag;
return UnicodeUtil::utf16Compare(len1, reinterpret_cast<const USHORT*>(str1), return UnicodeUtil::utf16Compare(len1, Firebird::Aligner<USHORT>(str1, len1),
len2, reinterpret_cast<const USHORT*>(str2), &error_flag); len2, Firebird::Aligner<USHORT>(str2, len2), &error_flag);
} }
SSHORT cmp = memcmp(str1, str2, MIN(len1, len2)); SSHORT cmp = memcmp(str1, str2, MIN(len1, len2));
@ -386,7 +386,9 @@ ULONG TextType::canonical(ULONG srcLen,
dstLen, Firebird::OutAligner<ULONG>(dst, dstLen), &errCode, &errPos) / sizeof(ULONG); dstLen, Firebird::OutAligner<ULONG>(dst, dstLen), &errCode, &errPos) / sizeof(ULONG);
} }
fb_assert(tt->texttype_canonical_width == getCharSet()->minBytesPerChar()); fb_assert(
(tt->texttype_canonical_width == 0 && !tt->texttype_fn_canonical) ||
tt->texttype_canonical_width == getCharSet()->minBytesPerChar());
fb_assert(dstLen >= srcLen); fb_assert(dstLen >= srcLen);
memcpy(dst, src, srcLen); memcpy(dst, src, srcLen);