ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chars: straighten out the flow of a loop, so it is easier to follow

master
Benno Schulenberg 2016-07-27 22:03:48 +02:00
parent d60f95137e
commit b305911cba
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/chars.c
View File

@ -512,8 +512,7 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
assert(s1 != NULL && s2 != NULL);
for (; *s1 != '\0' && *s2 != '\0' && n > 0;
s1 += move_mbright(s1, 0), s2 += move_mbright(s2, 0), n--) {
while (*s1 != '\0' && *s2 != '\0' && n > 0) {
bool bad1 = FALSE, bad2 = FALSE;
if (mbtowc(&wc1, s1, MB_CUR_MAX) < 0) {
@ -530,6 +529,10 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
if (bad1 != bad2 || towlower(wc1) != towlower(wc2))
break;
s1 += move_mbright(s1, 0);
s2 += move_mbright(s2, 0);
n--;
}
return (n > 0) ? towlower(wc1) - towlower(wc2) : 0;