diff options
| author | Ian Kelling | 2015-07-05 15:23:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-07-05 19:21:48 -0700 |
| commit | 08150826ae9e2e909d1f5aae8d4bdb4cd205b437 (patch) | |
| tree | c4bed142b0008789de7970d2e8ed7ce2a1c9169f /src | |
| parent | 904be8784cfd18cd920668c1d5b3a33353c6bb5b (diff) | |
| download | emacs-08150826ae9e2e909d1f5aae8d4bdb4cd205b437.tar.gz emacs-08150826ae9e2e909d1f5aae8d4bdb4cd205b437.zip | |
; Minor cleanup of wait_reading_process_output
* src/process.c (wait_reading_process_output):
Simplify logic. Fix DOS version comments (Bug#20978).
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/process.c b/src/process.c index 70c9076d4e8..9442a9d6da9 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4873,8 +4873,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4873 | no_avail = 1; | 4873 | no_avail = 1; |
| 4874 | FD_ZERO (&Available); | 4874 | FD_ZERO (&Available); |
| 4875 | } | 4875 | } |
| 4876 | 4876 | else | |
| 4877 | if (!no_avail) | ||
| 4878 | { | 4877 | { |
| 4879 | 4878 | ||
| 4880 | #ifdef ADAPTIVE_READ_BUFFERING | 4879 | #ifdef ADAPTIVE_READ_BUFFERING |
| @@ -6965,9 +6964,7 @@ extern int sys_select (int, fd_set *, fd_set *, fd_set *, | |||
| 6965 | DO_DISPLAY means redisplay should be done to show subprocess | 6964 | DO_DISPLAY means redisplay should be done to show subprocess |
| 6966 | output that arrives. | 6965 | output that arrives. |
| 6967 | 6966 | ||
| 6968 | Return positive if we received input from WAIT_PROC (or from any | 6967 | Return -1 signifying we got no output and did not try. */ |
| 6969 | process if WAIT_PROC is null), zero if we attempted to receive | ||
| 6970 | input but got none, and negative if we didn't even try. */ | ||
| 6971 | 6968 | ||
| 6972 | int | 6969 | int |
| 6973 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | 6970 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, |