mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-26 06:39:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: avoid parsing a character twice

Browse Source 
Let mbtowc() do all the work, and thus also elide a variable.
This commit is contained in:
Benno Schulenberg 2019-06-10 12:01:10 +02:00
parent 967f581860
commit 15e36956b5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/chars.c
View File

@ -541,7 +541,6 @@ char *mbstrchr(const char *s, const char *c)
#ifdef ENABLE_UTF8
if (use_utf8) {
bool bad_s_mb = FALSE, bad_c_mb = FALSE;
char symbol[MAXCHARLEN];
const char *q = s;
wchar_t ws, wc;
@ -551,9 +550,9 @@ char *mbstrchr(const char *s, const char *c)
}
while (*s != '\0') {
int sym_len = parse_mbchar(s, symbol, NULL);
int sym_len = mbtowc(&ws, s, MAXCHARLEN);
if (mbtowc(&ws, symbol, sym_len) < 0) {
if (sym_len < 0) {
ws = (unsigned char)*s;
bad_s_mb = TRUE;
}