Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.5 (#27093)

This commit is contained in:
Benjamin Peterson 2016-05-23 22:48:05 -07:00
parent 8ec1175204 5a093c158a
commit c35f491a06
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/cjkcodecs/cjkcodecs.h
View File

@ -328,22 +328,26 @@ find_pairencmap(ucs2_t body, ucs2_t modifier,
min = 0;
max = haystacksize;
for (pos = haystacksize >> 1; min != max; pos = (min + max) >> 1)
for (pos = haystacksize >> 1; min != max; pos = (min + max) >> 1) {
if (value < haystack[pos].uniseq) {
if (max == pos) break;
else max = pos;
if (max != pos) {
max = pos;
continue;
}
}
else if (value > haystack[pos].uniseq) {
if (min == pos) break;
else min = pos;
if (min != pos) {
min = pos;
continue;
}
}
else
break;
break;
}
if (value == haystack[pos].uniseq)
return haystack[pos].code;
else
return DBCINV;
if (value == haystack[pos].uniseq) {
return haystack[pos].code;
}
return DBCINV;
}
#endif