diff options
| author | Paul Eggert | 2011-04-15 03:23:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 03:23:56 -0700 |
| commit | 71b414062b06bf30438b5833b3dce9f70c3ce98b (patch) | |
| tree | f3ac973e7fb1f544153dd6e4b3d54f5a5bb8b949 /src | |
| parent | 9c3c56a7475d2ee8c834cbcc46e615b99bd6fced (diff) | |
| download | emacs-71b414062b06bf30438b5833b3dce9f70c3ce98b.tar.gz emacs-71b414062b06bf30438b5833b3dce9f70c3ce98b.zip | |
* sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/sysdep.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 200c20fc3bf..a088c1b42d0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-04-15 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT. | ||
| 4 | |||
| 3 | emacs_write: Accept and return EMACS_INT for sizes. | 5 | emacs_write: Accept and return EMACS_INT for sizes. |
| 4 | See http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00514.html | 6 | See http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00514.html |
| 5 | et seq. | 7 | et seq. |
diff --git a/src/sysdep.c b/src/sysdep.c index 6b6e3e9e791..e01bc4b1fbc 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -1844,7 +1844,10 @@ emacs_read (int fildes, char *buf, EMACS_INT nbyte) | |||
| 1844 | { | 1844 | { |
| 1845 | register ssize_t rtnval; | 1845 | register ssize_t rtnval; |
| 1846 | 1846 | ||
| 1847 | while ((rtnval = read (fildes, buf, min (nbyte, MAX_RW_COUNT))) == -1 | 1847 | /* There is no need to check against MAX_RW_COUNT, since no caller ever |
| 1848 | passes a size that large to emacs_read. */ | ||
| 1849 | |||
| 1850 | while ((rtnval = read (fildes, buf, nbyte)) == -1 | ||
| 1848 | && (errno == EINTR)) | 1851 | && (errno == EINTR)) |
| 1849 | QUIT; | 1852 | QUIT; |
| 1850 | return (rtnval); | 1853 | return (rtnval); |