JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-10-26 Jason Tishler <jason@tishler.net>

Browse Source 
* libc/stdio/fread.c (fread): Fix return value for unbuffered
        fread.
This commit is contained in:
Jeff Johnston 2004-10-26 18:21:09 +00:00
parent 8876d8cbec
commit 65b1964f1a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-26 Jason Tishler <jason@tishler.net>
* libc/stdio/fread.c (fread): Fix return value for unbuffered
fread.
2004-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2004-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* libc/include/machine/setjmp.h: Add AVR support. * libc/include/machine/setjmp.h: Add AVR support.

16
newlib/libc/stdio/fread.c
View File

@ -167,19 +167,15 @@ _DEFUN(fread, (buf, size, count, fp),
fp->_bf._base = old_base; fp->_bf._base = old_base;
fp->_bf._size = old_size; fp->_bf._size = old_size;
fp->_p = old_p; fp->_p = old_p;
if (rc)
{
/* no more input: return partial result */
#ifdef __SCLE #ifdef __SCLE
if (fp->_flags & __SCLE) if (fp->_flags & __SCLE)
{ {
_funlockfile (fp);
return crlf (fp, buf, total-resid, 1) / size;
}
#endif
_funlockfile (fp); _funlockfile (fp);
return (total - resid) / size; return crlf (fp, buf, total-resid, 1) / size;
} }
#endif
_funlockfile (fp);
return (total - resid) / size;
} }
} }
else else