Differences From Artifact [f9779f2392]:
- File src/OFString_UTF8.m — part of check-in [e0b9167693] at 2016-02-21 15:37:42 on branch trunk — Make use of C99-style for loops (user: js, size: 28082) [annotate] [blame] [check-ins using]
To Artifact [c460dbfe91]:
- File
src/OFString_UTF8.m
— part of check-in
[5e2ef97c35]
at
2016-03-13 11:19:13
on branch trunk
— Change of_string_utf8_decode() API
It now returns <= 0 on error, with negative values being the number of
bytes it would have needed * -1.This can be used to detect cut off and how many bytes are missing. (user: js, size: 28090) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
804 805 806 807 808 809 810 |
return OF_ORDERED_ASCENDING;
}
i = j = 0;
while (i < _s->cStringLength && j < otherCStringLength) {
of_unichar_t c1, c2;
| | | | 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 |
return OF_ORDERED_ASCENDING;
}
i = j = 0;
while (i < _s->cStringLength && j < otherCStringLength) {
of_unichar_t c1, c2;
ssize_t l1, l2;
l1 = of_string_utf8_decode(_s->cString + i,
_s->cStringLength - i, &c1);
l2 = of_string_utf8_decode(otherCString + j,
otherCStringLength - j, &c2);
if (l1 <= 0 || l2 <= 0 || c1 > 0x10FFFF || c2 > 0x10FFFF)
@throw [OFInvalidEncodingException exception];
if (c1 >> 8 < OF_UNICODE_CASEFOLDING_TABLE_SIZE) {
of_unichar_t tc =
of_unicode_casefolding_table[c1 >> 8][c1 & 0xFF];
if (tc)
|
| ︙ | ︙ | |||
858 859 860 861 862 863 864 |
if (_s->hashed)
return _s->hash;
OF_HASH_INIT(hash);
for (size_t i = 0; i < _s->cStringLength; i++) {
of_unichar_t c;
| | | | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 |
if (_s->hashed)
return _s->hash;
OF_HASH_INIT(hash);
for (size_t i = 0; i < _s->cStringLength; i++) {
of_unichar_t c;
ssize_t length;
if ((length = of_string_utf8_decode(_s->cString + i,
_s->cStringLength - i, &c)) <= 0)
@throw [OFInvalidEncodingException exception];
OF_HASH_ADD(hash, (c & 0xFF0000) >> 16);
OF_HASH_ADD(hash, (c & 0x00FF00) >> 8);
OF_HASH_ADD(hash, c & 0x0000FF);
i += length - 1;
|
| ︙ | ︙ | |||
892 893 894 895 896 897 898 | if (!_s->isUTF8) return _s->cString[index]; index = of_string_utf8_get_position(_s->cString, index, _s->cStringLength); | | | | 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | if (!_s->isUTF8) return _s->cString[index]; index = of_string_utf8_get_position(_s->cString, index, _s->cStringLength); if (of_string_utf8_decode(_s->cString + index, _s->cStringLength - index, &character) <= 0) @throw [OFInvalidEncodingException exception]; return character; } - (void)getCharacters: (of_unichar_t*)buffer inRange: (of_range_t)range |
| ︙ | ︙ | |||
1188 1189 1190 1191 1192 1193 1194 |
ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
count: _s->length];
i = j = 0;
while (i < _s->cStringLength) {
of_unichar_t c;
| | | | 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 |
ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
count: _s->length];
i = j = 0;
while (i < _s->cStringLength) {
of_unichar_t c;
ssize_t cLen;
cLen = of_string_utf8_decode(_s->cString + i,
_s->cStringLength - i, &c);
if (cLen <= 0 || c > 0x10FFFF)
@throw [OFInvalidEncodingException exception];
ret[j++] = c;
i += cLen;
}
return ret;
|
| ︙ | ︙ | |||
1216 1217 1218 1219 1220 1221 1222 |
ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
count: _s->length + 1];
i = j = 0;
while (i < _s->cStringLength) {
of_unichar_t c;
| | | | 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 |
ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
count: _s->length + 1];
i = j = 0;
while (i < _s->cStringLength) {
of_unichar_t c;
ssize_t cLen;
cLen = of_string_utf8_decode(_s->cString + i,
_s->cStringLength - i, &c);
if (cLen <= 0 || c > 0x10FFFF)
@throw [OFInvalidEncodingException exception];
if (byteOrder != OF_BYTE_ORDER_NATIVE)
ret[j++] = OF_BSWAP32(c);
else
ret[j++] = c;
|
| ︙ | ︙ |