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

in mbstrncasecmp(), mbstrnlen(), mbstrpbrk(), and has_blank_mbchars(), 

simplify by using for loops instead of while loops where possible, to
match the single-byte versions of these functions


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4127 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2007-07-09 22:36:32 +00:00
parent ae46b91b7e
commit bebfd9fbb6
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-09 David Lawrence Ramsey <pooka109@gmail.com>
* chars.c (mbstrncasecmp, mbstrnlen, mbstrpbrk,
has_blank_mbchars): Simplify by using for loops instead of while
loops where possible, to match the single-byte versions of these
functions.
2007-07-06 David Lawrence Ramsey <pooka109@gmail.com> 2007-07-06 David Lawrence Ramsey <pooka109@gmail.com>
* chars.c (nstrcasestr, mbstrcasestr, revstrstr, revstrcasestr, * chars.c (nstrcasestr, mbstrcasestr, revstrstr, revstrcasestr,

39
src/chars.c
View File

@ -537,7 +537,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
s1_mb = charalloc(MB_CUR_MAX); s1_mb = charalloc(MB_CUR_MAX);
s2_mb = charalloc(MB_CUR_MAX); s2_mb = charalloc(MB_CUR_MAX);
while (*s1 != '\0' && *s2 != '\0' && n > 0) { for (; *s1 != '\0' && *s2 != '\0' && n > 0; 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; int s1_mb_len, s2_mb_len;
@ -557,19 +558,15 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
bad_s2_mb = TRUE; bad_s2_mb = TRUE;
} }
if (n == 0 || bad_s1_mb != bad_s2_mb || if (bad_s1_mb != bad_s2_mb || towlower(ws1) !=
towlower(ws1) != towlower(ws2)) towlower(ws2))
break; break;
s1 += s1_mb_len;
s2 += s2_mb_len;
n--;
} }
free(s1_mb); free(s1_mb);
free(s2_mb); free(s2_mb);
return towlower(ws1) - towlower(ws2); return (n > 0) ? towlower(ws1) - towlower(ws2) : 0;
} else } else
#endif #endif
return strncasecmp(s1, s2, n); return strncasecmp(s1, s2, n);
@ -839,18 +836,10 @@ size_t mbstrnlen(const char *s, size_t maxlen)
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (use_utf8) { if (use_utf8) {
size_t n = 0; size_t n = 0;
int s_mb_len;
while (*s != '\0') { for (; *s != '\0' && maxlen > 0; s += move_mbright(s, 0),
s_mb_len = parse_mbchar(s, NULL, NULL); maxlen--, n++)
;
if (maxlen == 0)
break;
s += s_mb_len;
maxlen--;
n++;
}
return n; return n;
} else } else
@ -914,11 +903,9 @@ char *mbstrpbrk(const char *s, const char *accept)
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (use_utf8) { if (use_utf8) {
while (*s != '\0') { for (; *s != '\0'; s += move_mbright(s, 0)) {
if (mbstrchr(accept, s) != NULL) if (mbstrchr(accept, s) != NULL)
return (char *)s; return (char *)s;
s += move_mbright(s, 0);
} }
return NULL; return NULL;
@ -1000,18 +987,16 @@ bool has_blank_mbchars(const char *s)
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (use_utf8) { if (use_utf8) {
char *chr_mb = charalloc(MB_CUR_MAX);
bool retval = FALSE; bool retval = FALSE;
char *chr_mb = charalloc(MB_CUR_MAX);
while (*s != '\0') { for (; *s != '\0'; s += move_mbright(s, 0)) {
int chr_mb_len = parse_mbchar(s, chr_mb, NULL); parse_mbchar(s, chr_mb, NULL);
if (is_blank_mbchar(chr_mb)) { if (is_blank_mbchar(chr_mb)) {
retval = TRUE; retval = TRUE;
break; break;
} }
s += chr_mb_len;
} }
free(chr_mb); free(chr_mb);