* sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.

diff --git a/src/ChangeLog b/src/ChangeLog
index 200c20fc3bf0ce5f5ce4866b63bfce61eba802b3..a088c1b42d0d39b7993152ae6a173d1c16b20a13 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-15  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.
+
        emacs_write: Accept and return EMACS_INT for sizes.
        See http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00514.html
        et seq.

diff --git a/src/sysdep.c b/src/sysdep.c
index 6b6e3e9e791dde132395c2f796014661b1cb968f..e01bc4b1fbc6302a4a75b26a3260f5b0dc0b1d27 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1844,7 +1844,10 @@ emacs_read (int fildes, char *buf, EMACS_INT nbyte)
 {
   register ssize_t rtnval;
 
-  while ((rtnval = read (fildes, buf, min (nbyte, MAX_RW_COUNT))) == -1
+  /* There is no need to check against MAX_RW_COUNT, since no caller ever
+     passes a size that large to emacs_read.  */
+
+  while ((rtnval = read (fildes, buf, nbyte)) == -1
         && (errno == EINTR))
     QUIT;
   return (rtnval);