# HG changeset patch # User Bruno Haible # Date 1177835093 0 # Node ID 3d1951b8600f44d65792d61841b2e7954c22e9c3 # Parent e66db74e11a7954450b2b16f5e0937f7c5cc4ae8 Trivial simplification. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-04-29 Bruno Haible + + * lib/freading.c (freading): Trivial simplification. + 2007-04-28 Bruno Haible * tests/test-fwriting.c (main): Also test the interaction between diff --git a/lib/freading.c b/lib/freading.c --- 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;