nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Make more file-scope variables static.

Browse Source 
In the previous trawl of this, I didn't bother with the statics in
main-program modules, on the grounds that my main aim was to avoid
'library' objects (shared between multiple programs) from polluting
the global namespace. But I think it's worth being more strict after
all, so this commit adds 'static' to a lot more file-scope variables
that aren't needed outside their own module.
This commit is contained in:
Simon Tatham
2020-02-02 10:00:43 +00:00
parent 9729aabd94
commit fb5da46c48
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unix/gtkwin.c
View File

@ -49,7 +49,7 @@
#define NALLCOLOURS (NCFGCOLOURS + NEXTCOLOURS)
GdkAtom compound_text_atom, utf8_string_atom;
GdkAtom clipboard_atom
static GdkAtom clipboard_atom
#if GTK_CHECK_VERSION(2,0,0) /* GTK1 will have to fill this in at startup */
= GDK_SELECTION_CLIPBOARD
#endif

18
unix/uxpgnt.c
View File

@ -28,7 +28,7 @@ void cmdline_error(const char *fmt, ...)
exit(1);
}
FILE *pageant_logfp = NULL;
static FILE *pageant_logfp = NULL;
struct uxpgnt_client {
PageantListenerClient plc;
@ -173,7 +173,7 @@ struct X11Connection {
Plug plug;
};
char *socketname;
static char *socketname;
static enum { SHELL_AUTO, SHELL_SH, SHELL_CSH } shell_type = SHELL_AUTO;
void pageant_print_env(int pid)
{
@ -256,7 +256,7 @@ void pageant_fork_and_print_env(bool retain_tty)
}
}
int signalpipe[2];
static int signalpipe[2];
void sigchld(int signum)
{
@ -265,7 +265,7 @@ void sigchld(int signum)
}
#define TTY_LIFE_POLL_INTERVAL (TICKSPERSEC * 30)
void *dummy_timer_ctx;
static void *dummy_timer_ctx;
static void tty_life_timer(void *ctx, unsigned long now)
{
schedule_timer(TTY_LIFE_POLL_INTERVAL, tty_life_timer, &dummy_timer_ctx);
@ -291,7 +291,7 @@ bool is_agent_action(keyact action)
return action == KEYACT_AGENT_LOAD;
}
struct cmdline_key_action *keyact_head = NULL, *keyact_tail = NULL;
static struct cmdline_key_action *keyact_head = NULL, *keyact_tail = NULL;
void add_keyact(keyact action, const char *filename)
{
@ -321,12 +321,12 @@ bool have_controlling_tty(void)
}
}
char **exec_args = NULL;
enum {
static char **exec_args = NULL;
static enum {
LIFE_UNSPEC, LIFE_X11, LIFE_TTY, LIFE_DEBUG, LIFE_PERM, LIFE_EXEC
} life = LIFE_UNSPEC;
const char *display = NULL;
enum {
static const char *display = NULL;
static enum {
PROMPT_UNSPEC, PROMPT_TTY, PROMPT_GUI
} prompt_type = PROMPT_UNSPEC;

12
unix/uxplink.c
View File

@ -315,12 +315,12 @@ void cleanup_termios(void)
tcsetattr(STDIN_FILENO, TCSANOW, &orig_termios);
}
bufchain stdout_data, stderr_data;
bufchain_sink stdout_bcs, stderr_bcs;
StripCtrlChars *stdout_scc, *stderr_scc;
BinarySink *stdout_bs, *stderr_bs;
static bufchain stdout_data, stderr_data;
static bufchain_sink stdout_bcs, stderr_bcs;
static StripCtrlChars *stdout_scc, *stderr_scc;
static BinarySink *stdout_bs, *stderr_bs;
enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
static enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
size_t try_output(bool is_stderr)
{
@ -476,7 +476,7 @@ static void from_tty(void *vbuf, unsigned len)
}
}
int signalpipe[2];
static int signalpipe[2];
void sigwinch(int signum)
{