RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-05 03:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove invalid skip of locking in ungetwc

Browse Source 
aside from being invalid, the early check only optimized the error
case, and likely pessimized the common case by separating the
two branches on isascii(c) at opposite ends of the function.
This commit is contained in:
Rich Felker 2015-06-06 18:11:17 +00:00
parent 63f4b9f18f
commit 7e816a6487
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/stdio/ungetwc.c
View File

@ -11,18 +11,15 @@ wint_t ungetwc(wint_t c, FILE *f)
if (c == WEOF) return c;
/* Try conversion early so we can fail without locking if invalid */
if (!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)
return WEOF;
FLOCK(f);
f->mode |= f->mode+1;
if (!f->rpos) __toread(f);
if (!f->rpos || f->rpos < f->buf - UNGET + l) {
if (!f->rpos || f->rpos < f->buf - UNGET + l ||
(!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)) {
FUNLOCK(f);
return EOF;
return WEOF;
}
if (isascii(c)) *--f->rpos = c;