King_DuckZ/utfcpp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed the type for seqence_length from size_t to std::iterator_traits<octet_iterator>::difference_type

Browse source 
git-svn-id: http://svn.code.sf.net/p/utfcpp/code@27 a809a056-fc17-0410-9590-b4f493f8b08e
This commit is contained in:
ntrifunovic 2006-07-26 18:20:13 +00:00
parent b24be40542
commit 9e726bcc5e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/utf8.h
View file

@ -117,7 +117,8 @@ namespace internal
{ {
uint32_t cp = mask8(*it); uint32_t cp = mask8(*it);
// Check the lead octet // Check the lead octet
size_t sequence_length; typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
octet_difference_type sequence_length;
if (cp < 0x80) if (cp < 0x80)
sequence_length = 1; sequence_length = 1;
else if ((cp >> 5) == 0x6) else if ((cp >> 5) == 0x6)
@ -129,7 +130,7 @@ namespace internal
else else
return INVALID_LEAD; return INVALID_LEAD;
// Do we have enough memory? // Do we have enough memory?
if (size_t(end - it) < sequence_length) if (end - it < sequence_length)
return NOT_ENOUGH_ROOM; return NOT_ENOUGH_ROOM;
// Check trail octets and calculate the code point // Check trail octets and calculate the code point
@ -185,7 +186,7 @@ namespace internal
} }
// Is the code point valid? // Is the code point valid?
if (cp > CODE_POINT_MAX || is_surrogate(cp) || cp == 0xfffe || cp == 0xffff) { if (cp > CODE_POINT_MAX || is_surrogate(cp) || cp == 0xfffe || cp == 0xffff) {
for (size_t i = 0; i < sequence_length - 1; ++i) for (octet_difference_type i = 0; i < sequence_length - 1; ++i)
--it; --it;
return INVALID_CODE_POINT; return INVALID_CODE_POINT;
} }
@ -195,21 +196,21 @@ namespace internal
if (cp < 0x80) { if (cp < 0x80) {
if (sequence_length != 1) { if (sequence_length != 1) {
for (size_t i = 0; i < sequence_length - 1; ++i) for (octet_difference_type i = 0; i < sequence_length - 1; ++i)
--it; --it;
return OVERLONG_SEQUENCE; return OVERLONG_SEQUENCE;
} }
} }
else if (cp < 0x800) { else if (cp < 0x800) {
if (sequence_length != 2) { if (sequence_length != 2) {
for (size_t i = 0; i < sequence_length - 1; ++i) for (octet_difference_type i = 0; i < sequence_length - 1; ++i)
--it; --it;
return OVERLONG_SEQUENCE; return OVERLONG_SEQUENCE;
} }
} }
else if (cp < 0x10000) { else if (cp < 0x10000) {
if (sequence_length != 3) { if (sequence_length != 3) {
for (size_t i = 0; i < sequence_length - 1; ++i) for (octet_difference_type i = 0; i < sequence_length - 1; ++i)
--it; --it;
return OVERLONG_SEQUENCE; return OVERLONG_SEQUENCE;
} }