Mercurial > hg > octave-nkf > gnulib-hg
changeset 8752:3d1951b8600f
Trivial simplification.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 29 Apr 2007 08:24:53 +0000 |
parents | e66db74e11a7 |
children | 10d7922803f5 |
files | ChangeLog lib/freading.c |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-04-29 Bruno Haible <bruno@clisp.org> + + * lib/freading.c (freading): Trivial simplification. + 2007-04-28 Bruno Haible <bruno@clisp.org> * tests/test-fwriting.c (main): Also test the interaction between
--- a/lib/freading.c +++ b/lib/freading.c @@ -32,8 +32,7 @@ fast macros. */ #if defined _IO_ferror_unlocked /* GNU libc, BeOS */ return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & _IO_NO_READS) == 0 - && (fp->_flags & _IO_CURRENTLY_PUTTING) == 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ return (fp->_flags & __SRD) != 0;