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

tweaks: rename some variables for contrast

master
Benno Schulenberg 2016-05-24 16:49:00 +02:00
parent 6a2032f5b0
commit a151167416
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/chars.c
View File

@ -542,47 +542,44 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
{ {
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (use_utf8) { if (use_utf8) {
char *s1_mb, *s2_mb; char *mbchar1, *mbchar2;
wchar_t ws1, ws2; wchar_t wc1, wc2;
if (s1 == s2) if (s1 == s2)
return 0; return 0;
assert(s1 != NULL && s2 != NULL); assert(s1 != NULL && s2 != NULL);
s1_mb = charalloc(MB_CUR_MAX); mbchar1 = charalloc(MB_CUR_MAX);
s2_mb = charalloc(MB_CUR_MAX); mbchar2 = charalloc(MB_CUR_MAX);
for (; *s1 != '\0' && *s2 != '\0' && n > 0; s1 += for (; *s1 != '\0' && *s2 != '\0' && n > 0;
move_mbright(s1, 0), s2 += move_mbright(s2, 0), n--) { s1 += move_mbright(s1, 0), s2 += move_mbright(s2, 0), n--) {
bool bad_s1_mb = FALSE, bad_s2_mb = FALSE; bool bad_s1_mb = FALSE, bad_s2_mb = FALSE;
int s1_mb_len, s2_mb_len;
s1_mb_len = parse_mbchar(s1, s1_mb, NULL); int len1 = parse_mbchar(s1, mbchar1, NULL);
int len2 = parse_mbchar(s2, mbchar2, NULL);
if (mbtowc(&ws1, s1_mb, s1_mb_len) < 0) { if (mbtowc(&wc1, mbchar1, len1) < 0) {
mbtowc_reset(); mbtowc_reset();
ws1 = (unsigned char)*s1_mb; wc1 = (unsigned char)*mbchar1;
bad_s1_mb = TRUE; bad_s1_mb = TRUE;
} }
s2_mb_len = parse_mbchar(s2, s2_mb, NULL); if (mbtowc(&wc2, mbchar2, len2) < 0) {
if (mbtowc(&ws2, s2_mb, s2_mb_len) < 0) {
mbtowc_reset(); mbtowc_reset();
ws2 = (unsigned char)*s2_mb; wc2 = (unsigned char)*mbchar2;
bad_s2_mb = TRUE; bad_s2_mb = TRUE;
} }
if (bad_s1_mb != bad_s2_mb || towlower(ws1) != if (bad_s1_mb != bad_s2_mb || towlower(wc1) != towlower(wc2))
towlower(ws2))
break; break;
} }
free(s1_mb); free(mbchar1);
free(s2_mb); free(mbchar2);
return (n > 0) ? towlower(ws1) - towlower(ws2) : 0; return (n > 0) ? towlower(wc1) - towlower(wc2) : 0;
} else } else
#endif #endif
return strncasecmp(s1, s2, n); return strncasecmp(s1, s2, n);