From 91cbc7b729304302efe7e1d34ac9bb5dc6550f12 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 5 Jul 2015 15:38:29 -0700 Subject: [PATCH] ; 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). --- src/process.c | 12 ++++++------ 1 file 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, Vprocess_adaptive_read_buffering is nil. */ if (process_output_skip && check_delay > 0) { - int nsecs = timeout.tv_nsec; - if (timeout.tv_sec > 0 || nsecs > READ_OUTPUT_DELAY_MAX) - nsecs = READ_OUTPUT_DELAY_MAX; + int adaptive_nsecs = timeout.tv_nsec; + if (timeout.tv_sec > 0 || adaptive_nsecs > READ_OUTPUT_DELAY_MAX) + adaptive_nsecs = READ_OUTPUT_DELAY_MAX; for (channel = 0; check_delay > 0 && channel <= max_process_desc; channel++) { proc = chan_process[channel]; @@ -4885,11 +4885,11 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, continue; FD_CLR (channel, &Available); XPROCESS (proc)->read_output_skip = 0; - if (XPROCESS (proc)->read_output_delay < nsecs) - nsecs = XPROCESS (proc)->read_output_delay; + if (XPROCESS (proc)->read_output_delay < adaptive_nsecs) + adaptive_nsecs = XPROCESS (proc)->read_output_delay; } } - timeout = make_timespec (0, nsecs); + timeout = make_timespec (0, adaptive_nsecs); process_output_skip = 0; } -- 2.39.5