aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-08-20 10:33:25 +0000
committerKim F. Storm2004-08-20 10:33:25 +0000
commit214d60691b6ecc0c3cf469f70ceab6709c773954 (patch)
treefdbd0212b5e95bbadca451d0a3fcbb26b5440156 /src
parentdcd1ca45ed1d3e07390ca976f5026006ccae4444 (diff)
downloademacs-214d60691b6ecc0c3cf469f70ceab6709c773954.tar.gz
emacs-214d60691b6ecc0c3cf469f70ceab6709c773954.zip
(wait_reading_process_output): Rename from
wait_reading_process_input. All uses changed. (wait_reading_process_output_1): Rename from wait_reading_process_input_1. All uses changed.
Diffstat (limited to 'src')
-rw-r--r--src/process.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/process.c b/src/process.c
index ae4d366a694..21ab46f0d85 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3778,11 +3778,11 @@ Return non-nil iff we received any output before the timeout expired. */)
3778 seconds = NILP (process) ? -1 : 0; 3778 seconds = NILP (process) ? -1 : 0;
3779 3779
3780 return 3780 return
3781 (wait_reading_process_input (seconds, useconds, 0, 0, 3781 (wait_reading_process_output (seconds, useconds, 0, 0,
3782 Qnil, 3782 Qnil,
3783 !NILP (process) ? XPROCESS (process) : NULL, 3783 !NILP (process) ? XPROCESS (process) : NULL,
3784 NILP (just_this_one) ? 0 : 3784 NILP (just_this_one) ? 0 :
3785 !INTEGERP (just_this_one) ? 1 : -1) 3785 !INTEGERP (just_this_one) ? 1 : -1)
3786 ? Qt : Qnil); 3786 ? Qt : Qnil);
3787} 3787}
3788 3788
@@ -3982,12 +3982,12 @@ server_accept_connection (server, channel)
3982 lisp code is being evalled. 3982 lisp code is being evalled.
3983 This is also used in record_asynch_buffer_change. 3983 This is also used in record_asynch_buffer_change.
3984 For that purpose, this must be 0 3984 For that purpose, this must be 0
3985 when not inside wait_reading_process_input. */ 3985 when not inside wait_reading_process_output. */
3986static int waiting_for_user_input_p; 3986static int waiting_for_user_input_p;
3987 3987
3988/* This is here so breakpoints can be put on it. */ 3988/* This is here so breakpoints can be put on it. */
3989static void 3989static void
3990wait_reading_process_input_1 () 3990wait_reading_process_output_1 ()
3991{ 3991{
3992} 3992}
3993 3993
@@ -4029,8 +4029,8 @@ wait_reading_process_input_1 ()
4029 Otherwise, return true iff we received input from any process. */ 4029 Otherwise, return true iff we received input from any process. */
4030 4030
4031int 4031int
4032wait_reading_process_input (time_limit, microsecs, read_kbd, do_display, 4032wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
4033 wait_for_cell, wait_proc, just_wait_proc) 4033 wait_for_cell, wait_proc, just_wait_proc)
4034 int time_limit, microsecs, read_kbd, do_display; 4034 int time_limit, microsecs, read_kbd, do_display;
4035 Lisp_Object wait_for_cell; 4035 Lisp_Object wait_for_cell;
4036 struct Lisp_Process *wait_proc; 4036 struct Lisp_Process *wait_proc;
@@ -4168,7 +4168,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display,
4168 else if (time_limit != -1) 4168 else if (time_limit != -1)
4169 { 4169 {
4170 /* This is so a breakpoint can be put here. */ 4170 /* This is so a breakpoint can be put here. */
4171 wait_reading_process_input_1 (); 4171 wait_reading_process_output_1 ();
4172 } 4172 }
4173 } 4173 }
4174 4174
@@ -4411,9 +4411,9 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display,
4411 /* If we are using polling for input, 4411 /* If we are using polling for input,
4412 and we see input available, make it get read now. 4412 and we see input available, make it get read now.
4413 Otherwise it might not actually get read for a second. 4413 Otherwise it might not actually get read for a second.
4414 And on hpux, since we turn off polling in wait_reading_process_input, 4414 And on hpux, since we turn off polling in wait_reading_process_output,
4415 it might never get read at all if we don't spend much time 4415 it might never get read at all if we don't spend much time
4416 outside of wait_reading_process_input. */ 4416 outside of wait_reading_process_output. */
4417 if (read_kbd && interrupt_input 4417 if (read_kbd && interrupt_input
4418 && keyboard_bit_set (&Available) 4418 && keyboard_bit_set (&Available)
4419 && input_polling_used ()) 4419 && input_polling_used ())
@@ -5346,9 +5346,9 @@ send_process (proc, buf, len, object)
5346 offset = buf - SDATA (object); 5346 offset = buf - SDATA (object);
5347 5347
5348#ifdef EMACS_HAS_USECS 5348#ifdef EMACS_HAS_USECS
5349 wait_reading_process_input (0, 20000, 0, 0, Qnil, NULL, 0); 5349 wait_reading_process_output (0, 20000, 0, 0, Qnil, NULL, 0);
5350#else 5350#else
5351 wait_reading_process_input (1, 0, 0, 0, Qnil, NULL, 0); 5351 wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
5352#endif 5352#endif
5353 5353
5354 if (BUFFERP (object)) 5354 if (BUFFERP (object))
@@ -6210,7 +6210,7 @@ sigchld_handler (signo)
6210 FD_CLR (XINT (p->infd), &non_keyboard_wait_mask); 6210 FD_CLR (XINT (p->infd), &non_keyboard_wait_mask);
6211 } 6211 }
6212 6212
6213 /* Tell wait_reading_process_input that it needs to wake up and 6213 /* Tell wait_reading_process_output that it needs to wake up and
6214 look around. */ 6214 look around. */
6215 if (input_available_clear_time) 6215 if (input_available_clear_time)
6216 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); 6216 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
@@ -6228,7 +6228,7 @@ sigchld_handler (signo)
6228 else if (WIFSIGNALED (w)) 6228 else if (WIFSIGNALED (w))
6229 synch_process_termsig = WTERMSIG (w); 6229 synch_process_termsig = WTERMSIG (w);
6230 6230
6231 /* Tell wait_reading_process_input that it needs to wake up and 6231 /* Tell wait_reading_process_output that it needs to wake up and
6232 look around. */ 6232 look around. */
6233 if (input_available_clear_time) 6233 if (input_available_clear_time)
6234 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); 6234 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
@@ -6880,8 +6880,8 @@ Lisp_Object QCtype;
6880 Return true iff we received input from any process. */ 6880 Return true iff we received input from any process. */
6881 6881
6882int 6882int
6883wait_reading_process_input (time_limit, microsecs, read_kbd, do_display, 6883wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
6884 wait_for_cell, wait_proc, just_wait_proc) 6884 wait_for_cell, wait_proc, just_wait_proc)
6885 int time_limit, microsecs, read_kbd, do_display; 6885 int time_limit, microsecs, read_kbd, do_display;
6886 Lisp_Object wait_for_cell; 6886 Lisp_Object wait_for_cell;
6887 struct Lisp_Process *wait_proc; 6887 struct Lisp_Process *wait_proc;