diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-27 10:23:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-27 10:23:48 -0700 |
| commit | de1339b0a8a5b6b8bf784c816b2b974f4610e3ac (patch) | |
| tree | 2a77a2ce1b781f5cf30c734e9b0919a6ff3264ec /src/process.c | |
| parent | f10fe38f772c29031a23ef7aa92d2de1b3675461 (diff) | |
| download | emacs-de1339b0a8a5b6b8bf784c816b2b974f4610e3ac.tar.gz | |
* composite.c, data.c, dbusbind.c, dired.c: Use bool for booleans.
* composite.c (find_composition, composition_gstring_p)
(composition_reseat_it, find_automatic_composition):
* data.c (let_shadows_buffer_binding_p)
(let_shadows_global_binding_p, set_internal, make_blv)
(Fmake_variable_buffer_local, Fmake_local_variable)
(Fmake_variable_frame_local, arithcompare, cons_to_unsigned)
(cons_to_signed, arith_driver):
* dbusbind.c (xd_in_read_queued_messages):
* dired.c (directory_files_internal, file_name_completion):
Use bool for booleans.
* dired.c (file_name_completion):
* process.h (fd_callback):
Omit int (actually boolean) argument. It wasn't being used.
All uses changed.
* composite.h, lisp.h: Reflect above API changes.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/process.c b/src/process.c index 7f6f6bafbea..64c70c49590 100644 --- a/src/process.c +++ b/src/process.c @@ -4870,15 +4870,13 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, for (channel = 0; channel <= max_input_desc; ++channel) { struct fd_callback_data *d = &fd_callback_info[channel]; - if (FD_ISSET (channel, &Available) - && d->func != 0 - && (d->condition & FOR_READ) != 0) - d->func (channel, d->data, 1); - if (FD_ISSET (channel, &write_mask) - && d->func != 0 - && (d->condition & FOR_WRITE) != 0) - d->func (channel, d->data, 0); - } + if (d->func + && ((d->condition & FOR_READ + && FD_ISSET (channel, &Available)) + || (d->condition & FOR_WRITE + && FD_ISSET (channel, &write_mask)))) + d->func (channel, d->data); + } for (channel = 0; channel <= max_process_desc; channel++) { |