From: Bruno Haible <bruno@clisp.org>
Date: Sun, 29 Apr 2007 08:24:53 +0000 (+0000)
Subject: Trivial simplification.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2efbc429c545367a904e03e6f62b271ce48b70fd;p=pspp

Trivial simplification.
---

diff --git a/ChangeLog b/ChangeLog
index 3c75b003e6..e538c9c8b9 100644
--- 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 15ad06916e..38fd0155a6 100644
--- 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;