diff options
| author | Paul Eggert | 2011-04-13 19:16:00 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-13 19:16:00 -0700 |
| commit | 40ccffa6ff0f62689cac373e3d21d25084c1b7b3 (patch) | |
| tree | c1cf10b54e34c07a83fdcb7a572da10a2361c21a /src | |
| parent | ad64fc978bc5a83e25827ab4f55d4cbc8d0dd25a (diff) | |
| download | emacs-40ccffa6ff0f62689cac373e3d21d25084c1b7b3.tar.gz emacs-40ccffa6ff0f62689cac373e3d21d25084c1b7b3.zip | |
* process.c: Make symbols static if they're not exported.
(process_tick, update_tick, create_process, chan_process):
(Vprocess_alist, proc_buffered_char, datagram_access):
(fd_callback_data, send_process_frame, process_sent_to): Now static.
(deactivate_process): Mark defn as static, as well as decl.
* lisp.h (create_process): Remove decl.
* process.h (chan_process, Vprocess_alist): Remove decls.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lisp.h | 1 | ||||
| -rw-r--r-- | src/process.c | 26 | ||||
| -rw-r--r-- | src/process.h | 6 |
4 files changed, 20 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 78d3f0dacd2..aee24f4a2ed 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | 2011-04-14 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * process.c: Make symbols static if they're not exported. | ||
| 4 | (process_tick, update_tick, create_process, chan_process): | ||
| 5 | (Vprocess_alist, proc_buffered_char, datagram_access): | ||
| 6 | (fd_callback_data, send_process_frame, process_sent_to): Now static. | ||
| 7 | (deactivate_process): Mark defn as static, as well as decl. | ||
| 8 | * lisp.h (create_process): Remove decl. | ||
| 9 | * process.h (chan_process, Vprocess_alist): Remove decls. | ||
| 10 | |||
| 3 | * print.c: Make symbols static if they're not exported. | 11 | * print.c: Make symbols static if they're not exported. |
| 4 | (print_depth, new_backquote_output, being_printed, print_buffer): | 12 | (print_depth, new_backquote_output, being_printed, print_buffer): |
| 5 | (print_buffer_size, print_buffer_pos, print_buffer_pos_byte): | 13 | (print_buffer_size, print_buffer_pos, print_buffer_pos_byte): |
diff --git a/src/lisp.h b/src/lisp.h index 718f590b55a..508f0b3a40b 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3320,7 +3320,6 @@ extern void flush_pending_output (int); | |||
| 3320 | extern void child_setup_tty (int); | 3320 | extern void child_setup_tty (int); |
| 3321 | extern void setup_pty (int); | 3321 | extern void setup_pty (int); |
| 3322 | extern int set_window_size (int, int, int); | 3322 | extern int set_window_size (int, int, int); |
| 3323 | extern void create_process (Lisp_Object, char **, Lisp_Object); | ||
| 3324 | extern long get_random (void); | 3323 | extern long get_random (void); |
| 3325 | extern void seed_random (long); | 3324 | extern void seed_random (long); |
| 3326 | extern int emacs_open (const char *, int, int); | 3325 | extern int emacs_open (const char *, int, int); |
diff --git a/src/process.c b/src/process.c index 51546e7c78a..7efbab11190 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -165,12 +165,10 @@ extern Lisp_Object QCfilter; | |||
| 165 | extern int h_errno; | 165 | extern int h_errno; |
| 166 | #endif | 166 | #endif |
| 167 | 167 | ||
| 168 | /* These next two vars are non-static since sysdep.c uses them in the | ||
| 169 | emulation of `select'. */ | ||
| 170 | /* Number of events of change of status of a process. */ | 168 | /* Number of events of change of status of a process. */ |
| 171 | int process_tick; | 169 | static int process_tick; |
| 172 | /* Number of events for which the user or sentinel has been notified. */ | 170 | /* Number of events for which the user or sentinel has been notified. */ |
| 173 | int update_tick; | 171 | static int update_tick; |
| 174 | 172 | ||
| 175 | /* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */ | 173 | /* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */ |
| 176 | 174 | ||
| @@ -238,6 +236,7 @@ static int process_output_skip; | |||
| 238 | #endif | 236 | #endif |
| 239 | 237 | ||
| 240 | INFUN (Fget_process, 1); | 238 | INFUN (Fget_process, 1); |
| 239 | static void create_process (Lisp_Object, char **, Lisp_Object); | ||
| 241 | static int keyboard_bit_set (SELECT_TYPE *); | 240 | static int keyboard_bit_set (SELECT_TYPE *); |
| 242 | static void deactivate_process (Lisp_Object); | 241 | static void deactivate_process (Lisp_Object); |
| 243 | static void status_notify (struct Lisp_Process *); | 242 | static void status_notify (struct Lisp_Process *); |
| @@ -287,10 +286,10 @@ static int max_process_desc; | |||
| 287 | static int max_input_desc; | 286 | static int max_input_desc; |
| 288 | 287 | ||
| 289 | /* Indexed by descriptor, gives the process (if any) for that descriptor */ | 288 | /* Indexed by descriptor, gives the process (if any) for that descriptor */ |
| 290 | Lisp_Object chan_process[MAXDESC]; | 289 | static Lisp_Object chan_process[MAXDESC]; |
| 291 | 290 | ||
| 292 | /* Alist of elements (NAME . PROCESS) */ | 291 | /* Alist of elements (NAME . PROCESS) */ |
| 293 | Lisp_Object Vprocess_alist; | 292 | static Lisp_Object Vprocess_alist; |
| 294 | 293 | ||
| 295 | /* Buffered-ahead input char from process, indexed by channel. | 294 | /* Buffered-ahead input char from process, indexed by channel. |
| 296 | -1 means empty (no char is buffered). | 295 | -1 means empty (no char is buffered). |
| @@ -298,8 +297,7 @@ Lisp_Object Vprocess_alist; | |||
| 298 | output from the process is to read at least one char. | 297 | output from the process is to read at least one char. |
| 299 | Always -1 on systems that support FIONREAD. */ | 298 | Always -1 on systems that support FIONREAD. */ |
| 300 | 299 | ||
| 301 | /* Don't make static; need to access externally. */ | 300 | static int proc_buffered_char[MAXDESC]; |
| 302 | int proc_buffered_char[MAXDESC]; | ||
| 303 | 301 | ||
| 304 | /* Table of `struct coding-system' for each process. */ | 302 | /* Table of `struct coding-system' for each process. */ |
| 305 | static struct coding_system *proc_decode_coding_system[MAXDESC]; | 303 | static struct coding_system *proc_decode_coding_system[MAXDESC]; |
| @@ -307,7 +305,7 @@ static struct coding_system *proc_encode_coding_system[MAXDESC]; | |||
| 307 | 305 | ||
| 308 | #ifdef DATAGRAM_SOCKETS | 306 | #ifdef DATAGRAM_SOCKETS |
| 309 | /* Table of `partner address' for datagram sockets. */ | 307 | /* Table of `partner address' for datagram sockets. */ |
| 310 | struct sockaddr_and_len { | 308 | static struct sockaddr_and_len { |
| 311 | struct sockaddr *sa; | 309 | struct sockaddr *sa; |
| 312 | int len; | 310 | int len; |
| 313 | } datagram_address[MAXDESC]; | 311 | } datagram_address[MAXDESC]; |
| @@ -323,7 +321,7 @@ static int pty_max_bytes; | |||
| 323 | 321 | ||
| 324 | 322 | ||
| 325 | 323 | ||
| 326 | struct fd_callback_data | 324 | static struct fd_callback_data |
| 327 | { | 325 | { |
| 328 | fd_callback func; | 326 | fd_callback func; |
| 329 | void *data; | 327 | void *data; |
| @@ -1521,7 +1519,7 @@ create_process_1 (struct atimer *timer) | |||
| 1521 | } | 1519 | } |
| 1522 | 1520 | ||
| 1523 | 1521 | ||
| 1524 | void | 1522 | static void |
| 1525 | create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) | 1523 | create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) |
| 1526 | { | 1524 | { |
| 1527 | int inchannel, outchannel; | 1525 | int inchannel, outchannel; |
| @@ -3793,7 +3791,7 @@ FLAGS is the current flags of the interface. */) | |||
| 3793 | 3791 | ||
| 3794 | /* Turn off input and output for process PROC. */ | 3792 | /* Turn off input and output for process PROC. */ |
| 3795 | 3793 | ||
| 3796 | void | 3794 | static void |
| 3797 | deactivate_process (Lisp_Object proc) | 3795 | deactivate_process (Lisp_Object proc) |
| 3798 | { | 3796 | { |
| 3799 | register int inchannel, outchannel; | 3797 | register int inchannel, outchannel; |
| @@ -5219,8 +5217,8 @@ read_process_output (Lisp_Object proc, register int channel) | |||
| 5219 | 5217 | ||
| 5220 | /* Sending data to subprocess */ | 5218 | /* Sending data to subprocess */ |
| 5221 | 5219 | ||
| 5222 | jmp_buf send_process_frame; | 5220 | static jmp_buf send_process_frame; |
| 5223 | Lisp_Object process_sent_to; | 5221 | static Lisp_Object process_sent_to; |
| 5224 | 5222 | ||
| 5225 | static void | 5223 | static void |
| 5226 | send_process_trap (int ignore) | 5224 | send_process_trap (int ignore) |
diff --git a/src/process.h b/src/process.h index 1e90f553b38..0348f211bb9 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -143,12 +143,6 @@ struct Lisp_Process | |||
| 143 | 143 | ||
| 144 | #define ChannelMask(n) (1<<(n)) | 144 | #define ChannelMask(n) (1<<(n)) |
| 145 | 145 | ||
| 146 | /* Indexed by descriptor, gives the process (if any) for that descriptor. */ | ||
| 147 | extern Lisp_Object chan_process[]; | ||
| 148 | |||
| 149 | /* Alist of elements (NAME . PROCESS). */ | ||
| 150 | extern Lisp_Object Vprocess_alist; | ||
| 151 | |||
| 152 | /* True if we are about to fork off a synchronous process or if we | 146 | /* True if we are about to fork off a synchronous process or if we |
| 153 | are waiting for it. */ | 147 | are waiting for it. */ |
| 154 | extern int synch_process_alive; | 148 | extern int synch_process_alive; |