diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-05-24 05:48:05 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-05-24 05:48:05 (GMT) |
| commit | c35f491a06bb55cba097ddcd9fcbc9452ec21fb1 (patch) | |
| tree | 4b9ef3697101a09b12d7adf88fb22db186faeaa4 | |
| parent | 8ec11752046d19231c4a230e741ddc5b35e87218 (diff) | |
| parent | 5a093c158abda2c1e212c8ccc3cebba30a2a0596 (diff) | |
| download | cpython-c35f491a06bb55cba097ddcd9fcbc9452ec21fb1.zip cpython-c35f491a06bb55cba097ddcd9fcbc9452ec21fb1.tar.gz cpython-c35f491a06bb55cba097ddcd9fcbc9452ec21fb1.tar.bz2 | |
merge 3.5 (#27093)
| -rw-r--r-- | Modules/cjkcodecs/cjkcodecs.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h index 23642df..b72a3f0 100644 --- a/Modules/cjkcodecs/cjkcodecs.h +++ b/Modules/cjkcodecs/cjkcodecs.h @@ -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 |