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

tweaks: elide an unneeded variable

master
Benno Schulenberg 2019-06-10 12:06:12 +02:00
parent 15e36956b5
commit 787dca6724
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chars.c
View File

@ -541,7 +541,6 @@ char *mbstrchr(const char *s, const char *c)
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (use_utf8) { if (use_utf8) {
bool bad_s_mb = FALSE, bad_c_mb = FALSE; bool bad_s_mb = FALSE, bad_c_mb = FALSE;
const char *q = s;
wchar_t ws, wc; wchar_t ws, wc;
if (mbtowc(&wc, c, MAXCHARLEN) < 0) { if (mbtowc(&wc, c, MAXCHARLEN) < 0) {
@ -561,13 +560,12 @@ char *mbstrchr(const char *s, const char *c)
break; break;
s += sym_len; s += sym_len;
q += sym_len;
} }
if (*s == '\0') if (*s == '\0')
q = NULL; return NULL;
return (char *)q; return (char *)s;
} else } else
#endif #endif
return (char *)strchr(s, *c); return (char *)strchr(s, *c);