mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-24 10:12:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: rename three variables, to get rid of a suffix or an underscore

Browse Source 
Also drop an unneeded cast.
This commit is contained in:
Benno Schulenberg 2019-06-10 12:29:49 +02:00
parent 787dca6724
commit 45bf18f8fe
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/chars.c
View File

@ -540,26 +540,26 @@ char *mbstrchr(const char *s, const char *c)
{
#ifdef ENABLE_UTF8
if (use_utf8) {
bool bad_s_mb = FALSE, bad_c_mb = FALSE;
bool bad_s = FALSE, bad_c = FALSE;
wchar_t ws, wc;
if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
wc = (unsigned char)*c;
bad_c_mb = TRUE;
bad_c = TRUE;
}
while (*s != '\0') {
int sym_len = mbtowc(&ws, s, MAXCHARLEN);
int symlen = mbtowc(&ws, s, MAXCHARLEN);
if (sym_len < 0) {
if (symlen < 0) {
ws = (unsigned char)*s;
bad_s_mb = TRUE;
bad_s = TRUE;
}
if (bad_s_mb == bad_c_mb && ws == wc)
if (ws == wc && bad_s == bad_c)
break;
s += sym_len;
s += symlen;
}
if (*s == '\0')
@ -568,7 +568,7 @@ char *mbstrchr(const char *s, const char *c)
return (char *)s;
} else
#endif
return (char *)strchr(s, *c);
return strchr(s, *c);
}
#endif /* !NANO_TINY || ENABLE_JUSTIFY */