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

tweaks: don't optimize for a special case -- it is far too seldom

master
Benno Schulenberg 2016-08-06 11:06:29 +02:00
parent 85844ee6ef
commit 370406bb41
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/chars.c
View File

@ -514,7 +514,6 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
while (*s1 != '\0' && *s2 != '\0' && n > 0) { while (*s1 != '\0' && *s2 != '\0' && n > 0) {
bool bad1 = FALSE, bad2 = FALSE; bool bad1 = FALSE, bad2 = FALSE;
int difference;
if (mbtowc(&wc1, s1, MB_CUR_MAX) < 0) { if (mbtowc(&wc1, s1, MB_CUR_MAX) < 0) {
mbtowc_reset(); mbtowc_reset();
@ -532,16 +531,13 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
if (bad1 != bad2) if (bad1 != bad2)
return (bad1 ? 1 : -1); return (bad1 ? 1 : -1);
} else {
int difference = towlower(wc1) - towlower(wc2);
s1++; s2++; n--; if (difference != 0)
continue; return difference;
} }
difference = towlower(wc1) - towlower(wc2);
if (difference != 0)
return difference;
s1 += move_mbright(s1, 0); s1 += move_mbright(s1, 0);
s2 += move_mbright(s2, 0); s2 += move_mbright(s2, 0);
n--; n--;