Trivial simplification.

diff --git a/ChangeLog b/ChangeLog
index 3c75b003e62207b73edea38df8a02ddd9d2485a4..e538c9c8b9774b61a20ca953891dcab47748b664 100644 (file)
--- 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

diff --git a/lib/freading.c b/lib/freading.c
index 15ad06916e1a8a1b3c17678f69c139d4e3f419d8..38fd0155a6ddec91900e099e26334f303c4d92e2 100644 (file)
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -32,8 +32,7 @@ freading (FILE *fp)
      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;