diff options
| author | Paul Eggert | 2012-09-19 18:37:07 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-19 18:37:07 -0700 |
| commit | f75beb4787372df3dcc50cbb07407f45ff04bf04 (patch) | |
| tree | 19a41069b797bb16623d630b35343525f6172f01 /src/xterm.c | |
| parent | b019b76a181d6af0c73559b73f9735b91bc71d21 (diff) | |
| download | emacs-f75beb4787372df3dcc50cbb07407f45ff04bf04.tar.gz emacs-f75beb4787372df3dcc50cbb07407f45ff04bf04.zip | |
Omit unused arg EXPECTED from socket hooks.
* keyboard.c (gobble_input, read_avail_input, tty_read_avail_input):
* nsterm.m (ns_term_init):
* termhooks.h (struct terminal.read_socket_hook):
* w32inevt.c (w32_console_read_socket):
* w32term.c (w32_read_socket):
* xterm.c (XTread_socket):
Omit unused arg EXPECTED. All callers changed.
(store_user_signal_events): Return void, not int, since callers no
longer care about the return value. All uses changed.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/xterm.c b/src/xterm.c index 9ab53dc087a..8c955d0e576 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -7109,19 +7109,15 @@ x_dispatch_event (XEvent *event, Display *display) | |||
| 7109 | 7109 | ||
| 7110 | 7110 | ||
| 7111 | /* Read events coming from the X server. | 7111 | /* Read events coming from the X server. |
| 7112 | This routine is called by the SIGIO handler only if SYNC_INPUT is | 7112 | Return as soon as there are no more events to be read. |
| 7113 | not defined. | ||
| 7114 | We return as soon as there are no more events to be read. | ||
| 7115 | 7113 | ||
| 7116 | We return the number of characters stored into the buffer, | 7114 | Return the number of characters stored into the buffer, |
| 7117 | thus pretending to be `read' (except the characters we store | 7115 | thus pretending to be `read' (except the characters we store |
| 7118 | in the keyboard buffer can be multibyte, so are not necessarily | 7116 | in the keyboard buffer can be multibyte, so are not necessarily |
| 7119 | C chars). | 7117 | C chars). */ |
| 7120 | |||
| 7121 | EXPECTED is nonzero if the caller knows input is available. */ | ||
| 7122 | 7118 | ||
| 7123 | static int | 7119 | static int |
| 7124 | XTread_socket (struct terminal *terminal, int expected, struct input_event *hold_quit) | 7120 | XTread_socket (struct terminal *terminal, struct input_event *hold_quit) |
| 7125 | { | 7121 | { |
| 7126 | int count = 0; | 7122 | int count = 0; |
| 7127 | int event_found = 0; | 7123 | int event_found = 0; |