* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 78d3f0dacd212e270de65ee64fdfc2d4f933b66e..aee24f4a2edac22798126590c141afe488acd0b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * 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.
+
        * print.c: Make symbols static if they're not exported.
        (print_depth, new_backquote_output, being_printed, print_buffer):
        (print_buffer_size, print_buffer_pos, print_buffer_pos_byte):

diff --git a/src/lisp.h b/src/lisp.h
index 718f590b55a7feee1629c55e27157bdf5c0ee441..508f0b3a40baae8de127c2697eb1096b7d2439db 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3320,7 +3320,6 @@ extern void flush_pending_output (int);
 extern void child_setup_tty (int);
 extern void setup_pty (int);
 extern int set_window_size (int, int, int);
-extern void create_process (Lisp_Object, char **, Lisp_Object);
 extern long get_random (void);
 extern void seed_random (long);
 extern int emacs_open (const char *, int, int);

diff --git a/src/process.c b/src/process.c
index 51546e7c78aa5f62f2701b6d393eb5a70b2e53d0..7efbab11190496132f20f6ca89a7413e5d8ad4c8 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -165,12 +165,10 @@ extern Lisp_Object QCfilter;
 extern int h_errno;
 #endif
 
-/* These next two vars are non-static since sysdep.c uses them in the
-   emulation of `select'.  */
 /* Number of events of change of status of a process.  */
-int process_tick;
+static int process_tick;
 /* Number of events for which the user or sentinel has been notified.  */
-int update_tick;
+static int update_tick;
 
 /* Define NON_BLOCKING_CONNECT if we can support non-blocking connects.  */
 
@@ -238,6 +236,7 @@ static int process_output_skip;
 #endif
 
 INFUN (Fget_process, 1);
+static void create_process (Lisp_Object, char **, Lisp_Object);
 static int keyboard_bit_set (SELECT_TYPE *);
 static void deactivate_process (Lisp_Object);
 static void status_notify (struct Lisp_Process *);
@@ -287,10 +286,10 @@ static int max_process_desc;
 static int max_input_desc;
 
 /* Indexed by descriptor, gives the process (if any) for that descriptor */
-Lisp_Object chan_process[MAXDESC];
+static Lisp_Object chan_process[MAXDESC];
 
 /* Alist of elements (NAME . PROCESS) */
-Lisp_Object Vprocess_alist;
+static Lisp_Object Vprocess_alist;
 
 /* Buffered-ahead input char from process, indexed by channel.
    -1 means empty (no char is buffered).
@@ -298,8 +297,7 @@ Lisp_Object Vprocess_alist;
    output from the process is to read at least one char.
    Always -1 on systems that support FIONREAD.  */
 
-/* Don't make static; need to access externally.  */
-int proc_buffered_char[MAXDESC];
+static int proc_buffered_char[MAXDESC];
 
 /* Table of `struct coding-system' for each process.  */
 static struct coding_system *proc_decode_coding_system[MAXDESC];
@@ -307,7 +305,7 @@ static struct coding_system *proc_encode_coding_system[MAXDESC];
 
 #ifdef DATAGRAM_SOCKETS
 /* Table of `partner address' for datagram sockets.  */
-struct sockaddr_and_len {
+static struct sockaddr_and_len {
   struct sockaddr *sa;
   int len;
 } datagram_address[MAXDESC];
@@ -323,7 +321,7 @@ static int pty_max_bytes;
 
 \f
 
-struct fd_callback_data
+static struct fd_callback_data
 {
   fd_callback func;
   void *data;
@@ -1521,7 +1519,7 @@ create_process_1 (struct atimer *timer)
 }
 
 
-void
+static void
 create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
 {
   int inchannel, outchannel;
@@ -3793,7 +3791,7 @@ FLAGS is the current flags of the interface.  */)
 
 /* Turn off input and output for process PROC.  */
 
-void
+static void
 deactivate_process (Lisp_Object proc)
 {
   register int inchannel, outchannel;
@@ -5219,8 +5217,8 @@ read_process_output (Lisp_Object proc, register int channel)
 \f
 /* Sending data to subprocess */
 
-jmp_buf send_process_frame;
-Lisp_Object process_sent_to;
+static jmp_buf send_process_frame;
+static Lisp_Object process_sent_to;
 
 static void
 send_process_trap (int ignore)

diff --git a/src/process.h b/src/process.h
index 1e90f553b387b4bc5350ad47c90777eea24075d0..0348f211bb9856e2bb64d9661560563a9eb804f0 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -143,12 +143,6 @@ struct Lisp_Process
 
 #define ChannelMask(n) (1<<(n))
 
-/* Indexed by descriptor, gives the process (if any) for that descriptor.  */
-extern Lisp_Object chan_process[];
-
-/* Alist of elements (NAME . PROCESS).  */
-extern Lisp_Object Vprocess_alist;
-
 /* True if we are about to fork off a synchronous process or if we
    are waiting for it.  */
 extern int synch_process_alive;