diff options
| author | Ian Kelling | 2015-07-05 15:38:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-07-05 19:21:49 -0700 |
| commit | 91cbc7b729304302efe7e1d34ac9bb5dc6550f12 (patch) | |
| tree | 9d9b91e4c3527824fe42430652ba98c8653a2c6f /src | |
| parent | 082eda1cbebfc4a71c4b721b38be67aa2de6441e (diff) | |
| download | emacs-91cbc7b729304302efe7e1d34ac9bb5dc6550f12.tar.gz emacs-91cbc7b729304302efe7e1d34ac9bb5dc6550f12.zip | |
; Rename local var nsecs to adaptive_nsecs
* src/process.c (wait_reading_process_output): Rename inner nsecs to
adaptive_nsecs. There is already an nsecs, and this function is
confusing enough (Bug#20978).
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/process.c b/src/process.c index 2bac386139d..6b3648e6952 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4868,9 +4868,9 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4868 | Vprocess_adaptive_read_buffering is nil. */ | 4868 | Vprocess_adaptive_read_buffering is nil. */ |
| 4869 | if (process_output_skip && check_delay > 0) | 4869 | if (process_output_skip && check_delay > 0) |
| 4870 | { | 4870 | { |
| 4871 | int nsecs = timeout.tv_nsec; | 4871 | int adaptive_nsecs = timeout.tv_nsec; |
| 4872 | if (timeout.tv_sec > 0 || nsecs > READ_OUTPUT_DELAY_MAX) | 4872 | if (timeout.tv_sec > 0 || adaptive_nsecs > READ_OUTPUT_DELAY_MAX) |
| 4873 | nsecs = READ_OUTPUT_DELAY_MAX; | 4873 | adaptive_nsecs = READ_OUTPUT_DELAY_MAX; |
| 4874 | for (channel = 0; check_delay > 0 && channel <= max_process_desc; channel++) | 4874 | for (channel = 0; check_delay > 0 && channel <= max_process_desc; channel++) |
| 4875 | { | 4875 | { |
| 4876 | proc = chan_process[channel]; | 4876 | proc = chan_process[channel]; |
| @@ -4885,11 +4885,11 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4885 | continue; | 4885 | continue; |
| 4886 | FD_CLR (channel, &Available); | 4886 | FD_CLR (channel, &Available); |
| 4887 | XPROCESS (proc)->read_output_skip = 0; | 4887 | XPROCESS (proc)->read_output_skip = 0; |
| 4888 | if (XPROCESS (proc)->read_output_delay < nsecs) | 4888 | if (XPROCESS (proc)->read_output_delay < adaptive_nsecs) |
| 4889 | nsecs = XPROCESS (proc)->read_output_delay; | 4889 | adaptive_nsecs = XPROCESS (proc)->read_output_delay; |
| 4890 | } | 4890 | } |
| 4891 | } | 4891 | } |
| 4892 | timeout = make_timespec (0, nsecs); | 4892 | timeout = make_timespec (0, adaptive_nsecs); |
| 4893 | process_output_skip = 0; | 4893 | process_output_skip = 0; |
| 4894 | } | 4894 | } |
| 4895 | 4895 | ||