===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- src/usr.bin/tmux/input.c	2016/09/28 14:40:07	1.103
+++ src/usr.bin/tmux/input.c	2016/10/03 22:52:11	1.104
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.103 2016/09/28 14:40:07 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.104 2016/10/03 22:52:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -98,45 +98,46 @@
 
 /* Helper functions. */
 struct input_transition;
-int	input_split(struct input_ctx *);
-int	input_get(struct input_ctx *, u_int, int, int);
-void printflike(2, 3) input_reply(struct input_ctx *, const char *, ...);
-void	input_set_state(struct window_pane *, const struct input_transition *);
-void	input_reset_cell(struct input_ctx *);
+static int	input_split(struct input_ctx *);
+static int	input_get(struct input_ctx *, u_int, int, int);
+static void printflike(2, 3) input_reply(struct input_ctx *, const char *, ...);
+static void	input_set_state(struct window_pane *,
+		    const struct input_transition *);
+static void	input_reset_cell(struct input_ctx *);
 
 /* Transition entry/exit handlers. */
-void	input_clear(struct input_ctx *);
-void	input_ground(struct input_ctx *);
-void	input_enter_osc(struct input_ctx *);
-void	input_exit_osc(struct input_ctx *);
-void	input_enter_apc(struct input_ctx *);
-void	input_exit_apc(struct input_ctx *);
-void	input_enter_rename(struct input_ctx *);
-void	input_exit_rename(struct input_ctx *);
+static void	input_clear(struct input_ctx *);
+static void	input_ground(struct input_ctx *);
+static void	input_enter_osc(struct input_ctx *);
+static void	input_exit_osc(struct input_ctx *);
+static void	input_enter_apc(struct input_ctx *);
+static void	input_exit_apc(struct input_ctx *);
+static void	input_enter_rename(struct input_ctx *);
+static void	input_exit_rename(struct input_ctx *);
 
 /* Input state handlers. */
-int	input_print(struct input_ctx *);
-int	input_intermediate(struct input_ctx *);
-int	input_parameter(struct input_ctx *);
-int	input_input(struct input_ctx *);
-int	input_c0_dispatch(struct input_ctx *);
-int	input_esc_dispatch(struct input_ctx *);
-int	input_csi_dispatch(struct input_ctx *);
-void	input_csi_dispatch_rm(struct input_ctx *);
-void	input_csi_dispatch_rm_private(struct input_ctx *);
-void	input_csi_dispatch_sm(struct input_ctx *);
-void	input_csi_dispatch_sm_private(struct input_ctx *);
-void	input_csi_dispatch_winops(struct input_ctx *);
-void	input_csi_dispatch_sgr_256(struct input_ctx *, int, u_int *);
-void	input_csi_dispatch_sgr_rgb(struct input_ctx *, int, u_int *);
-void	input_csi_dispatch_sgr(struct input_ctx *);
-int	input_dcs_dispatch(struct input_ctx *);
-int	input_utf8_open(struct input_ctx *);
-int	input_utf8_add(struct input_ctx *);
-int	input_utf8_close(struct input_ctx *);
+static int	input_print(struct input_ctx *);
+static int	input_intermediate(struct input_ctx *);
+static int	input_parameter(struct input_ctx *);
+static int	input_input(struct input_ctx *);
+static int	input_c0_dispatch(struct input_ctx *);
+static int	input_esc_dispatch(struct input_ctx *);
+static int	input_csi_dispatch(struct input_ctx *);
+static void	input_csi_dispatch_rm(struct input_ctx *);
+static void	input_csi_dispatch_rm_private(struct input_ctx *);
+static void	input_csi_dispatch_sm(struct input_ctx *);
+static void	input_csi_dispatch_sm_private(struct input_ctx *);
+static void	input_csi_dispatch_winops(struct input_ctx *);
+static void	input_csi_dispatch_sgr_256(struct input_ctx *, int, u_int *);
+static void	input_csi_dispatch_sgr_rgb(struct input_ctx *, int, u_int *);
+static void	input_csi_dispatch_sgr(struct input_ctx *);
+static int	input_dcs_dispatch(struct input_ctx *);
+static int	input_utf8_open(struct input_ctx *);
+static int	input_utf8_add(struct input_ctx *);
+static int	input_utf8_close(struct input_ctx *);
 
 /* Command table comparison function. */
-int	input_table_compare(const void *, const void *);
+static int	input_table_compare(const void *, const void *);
 
 /* Command table entry. */
 struct input_table_entry {
@@ -164,7 +165,7 @@
 };
 
 /* Escape command table. */
-const struct input_table_entry input_esc_table[] = {
+static const struct input_table_entry input_esc_table[] = {
 	{ '0', "(", INPUT_ESC_SCSG0_ON },
 	{ '0', ")", INPUT_ESC_SCSG1_ON },
 	{ '7', "",  INPUT_ESC_DECSC },
@@ -217,7 +218,7 @@
 };
 
 /* Control (CSI) command table. */
-const struct input_table_entry input_csi_table[] = {
+static const struct input_table_entry input_csi_table[] = {
 	{ '@', "",  INPUT_CSI_ICH },
 	{ 'A', "",  INPUT_CSI_CUU },
 	{ 'B', "",  INPUT_CSI_CUD },
@@ -276,169 +277,169 @@
 	{ 0x1b, 0x1b, NULL,		 &input_state_esc_enter }
 
 /* Forward declarations of state tables. */
-const struct input_transition input_state_ground_table[];
-const struct input_transition input_state_esc_enter_table[];
-const struct input_transition input_state_esc_intermediate_table[];
-const struct input_transition input_state_csi_enter_table[];
-const struct input_transition input_state_csi_parameter_table[];
-const struct input_transition input_state_csi_intermediate_table[];
-const struct input_transition input_state_csi_ignore_table[];
-const struct input_transition input_state_dcs_enter_table[];
-const struct input_transition input_state_dcs_parameter_table[];
-const struct input_transition input_state_dcs_intermediate_table[];
-const struct input_transition input_state_dcs_handler_table[];
-const struct input_transition input_state_dcs_escape_table[];
-const struct input_transition input_state_dcs_ignore_table[];
-const struct input_transition input_state_osc_string_table[];
-const struct input_transition input_state_apc_string_table[];
-const struct input_transition input_state_rename_string_table[];
-const struct input_transition input_state_consume_st_table[];
-const struct input_transition input_state_utf8_three_table[];
-const struct input_transition input_state_utf8_two_table[];
-const struct input_transition input_state_utf8_one_table[];
+static const struct input_transition input_state_ground_table[];
+static const struct input_transition input_state_esc_enter_table[];
+static const struct input_transition input_state_esc_intermediate_table[];
+static const struct input_transition input_state_csi_enter_table[];
+static const struct input_transition input_state_csi_parameter_table[];
+static const struct input_transition input_state_csi_intermediate_table[];
+static const struct input_transition input_state_csi_ignore_table[];
+static const struct input_transition input_state_dcs_enter_table[];
+static const struct input_transition input_state_dcs_parameter_table[];
+static const struct input_transition input_state_dcs_intermediate_table[];
+static const struct input_transition input_state_dcs_handler_table[];
+static const struct input_transition input_state_dcs_escape_table[];
+static const struct input_transition input_state_dcs_ignore_table[];
+static const struct input_transition input_state_osc_string_table[];
+static const struct input_transition input_state_apc_string_table[];
+static const struct input_transition input_state_rename_string_table[];
+static const struct input_transition input_state_consume_st_table[];
+static const struct input_transition input_state_utf8_three_table[];
+static const struct input_transition input_state_utf8_two_table[];
+static const struct input_transition input_state_utf8_one_table[];
 
 /* ground state definition. */
-const struct input_state input_state_ground = {
+static const struct input_state input_state_ground = {
 	"ground",
 	input_ground, NULL,
 	input_state_ground_table
 };
 
 /* esc_enter state definition. */
-const struct input_state input_state_esc_enter = {
+static const struct input_state input_state_esc_enter = {
 	"esc_enter",
 	input_clear, NULL,
 	input_state_esc_enter_table
 };
 
 /* esc_intermediate state definition. */
-const struct input_state input_state_esc_intermediate = {
+static const struct input_state input_state_esc_intermediate = {
 	"esc_intermediate",
 	NULL, NULL,
 	input_state_esc_intermediate_table
 };
 
 /* csi_enter state definition. */
-const struct input_state input_state_csi_enter = {
+static const struct input_state input_state_csi_enter = {
 	"csi_enter",
 	input_clear, NULL,
 	input_state_csi_enter_table
 };
 
 /* csi_parameter state definition. */
-const struct input_state input_state_csi_parameter = {
+static const struct input_state input_state_csi_parameter = {
 	"csi_parameter",
 	NULL, NULL,
 	input_state_csi_parameter_table
 };
 
 /* csi_intermediate state definition. */
-const struct input_state input_state_csi_intermediate = {
+static const struct input_state input_state_csi_intermediate = {
 	"csi_intermediate",
 	NULL, NULL,
 	input_state_csi_intermediate_table
 };
 
 /* csi_ignore state definition. */
-const struct input_state input_state_csi_ignore = {
+static const struct input_state input_state_csi_ignore = {
 	"csi_ignore",
 	NULL, NULL,
 	input_state_csi_ignore_table
 };
 
 /* dcs_enter state definition. */
-const struct input_state input_state_dcs_enter = {
+static const struct input_state input_state_dcs_enter = {
 	"dcs_enter",
 	input_clear, NULL,
 	input_state_dcs_enter_table
 };
 
 /* dcs_parameter state definition. */
-const struct input_state input_state_dcs_parameter = {
+static const struct input_state input_state_dcs_parameter = {
 	"dcs_parameter",
 	NULL, NULL,
 	input_state_dcs_parameter_table
 };
 
 /* dcs_intermediate state definition. */
-const struct input_state input_state_dcs_intermediate = {
+static const struct input_state input_state_dcs_intermediate = {
 	"dcs_intermediate",
 	NULL, NULL,
 	input_state_dcs_intermediate_table
 };
 
 /* dcs_handler state definition. */
-const struct input_state input_state_dcs_handler = {
+static const struct input_state input_state_dcs_handler = {
 	"dcs_handler",
 	NULL, NULL,
 	input_state_dcs_handler_table
 };
 
 /* dcs_escape state definition. */
-const struct input_state input_state_dcs_escape = {
+static const struct input_state input_state_dcs_escape = {
 	"dcs_escape",
 	NULL, NULL,
 	input_state_dcs_escape_table
 };
 
 /* dcs_ignore state definition. */
-const struct input_state input_state_dcs_ignore = {
+static const struct input_state input_state_dcs_ignore = {
 	"dcs_ignore",
 	NULL, NULL,
 	input_state_dcs_ignore_table
 };
 
 /* osc_string state definition. */
-const struct input_state input_state_osc_string = {
+static const struct input_state input_state_osc_string = {
 	"osc_string",
 	input_enter_osc, input_exit_osc,
 	input_state_osc_string_table
 };
 
 /* apc_string state definition. */
-const struct input_state input_state_apc_string = {
+static const struct input_state input_state_apc_string = {
 	"apc_string",
 	input_enter_apc, input_exit_apc,
 	input_state_apc_string_table
 };
 
 /* rename_string state definition. */
-const struct input_state input_state_rename_string = {
+static const struct input_state input_state_rename_string = {
 	"rename_string",
 	input_enter_rename, input_exit_rename,
 	input_state_rename_string_table
 };
 
 /* consume_st state definition. */
-const struct input_state input_state_consume_st = {
+static const struct input_state input_state_consume_st = {
 	"consume_st",
 	NULL, NULL,
 	input_state_consume_st_table
 };
 
 /* utf8_three state definition. */
-const struct input_state input_state_utf8_three = {
+static const struct input_state input_state_utf8_three = {
 	"utf8_three",
 	NULL, NULL,
 	input_state_utf8_three_table
 };
 
 /* utf8_two state definition. */
-const struct input_state input_state_utf8_two = {
+static const struct input_state input_state_utf8_two = {
 	"utf8_two",
 	NULL, NULL,
 	input_state_utf8_two_table
 };
 
 /* utf8_one state definition. */
-const struct input_state input_state_utf8_one = {
+static const struct input_state input_state_utf8_one = {
 	"utf8_one",
 	NULL, NULL,
 	input_state_utf8_one_table
 };
 
 /* ground state table. */
-const struct input_transition input_state_ground_table[] = {
+static const struct input_transition input_state_ground_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch, NULL },
@@ -456,7 +457,7 @@
 };
 
 /* esc_enter state table. */
-const struct input_transition input_state_esc_enter_table[] = {
+static const struct input_transition input_state_esc_enter_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch,  NULL },
@@ -483,7 +484,7 @@
 };
 
 /* esc_interm state table. */
-const struct input_transition input_state_esc_intermediate_table[] = {
+static const struct input_transition input_state_esc_intermediate_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch,  NULL },
@@ -497,7 +498,7 @@
 };
 
 /* csi_enter state table. */
-const struct input_transition input_state_csi_enter_table[] = {
+static const struct input_transition input_state_csi_enter_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch,  NULL },
@@ -515,7 +516,7 @@
 };
 
 /* csi_parameter state table. */
-const struct input_transition input_state_csi_parameter_table[] = {
+static const struct input_transition input_state_csi_parameter_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch,  NULL },
@@ -533,7 +534,7 @@
 };
 
 /* csi_intermediate state table. */
-const struct input_transition input_state_csi_intermediate_table[] = {
+static const struct input_transition input_state_csi_intermediate_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch,  NULL },
@@ -548,7 +549,7 @@
 };
 
 /* csi_ignore state table. */
-const struct input_transition input_state_csi_ignore_table[] = {
+static const struct input_transition input_state_csi_ignore_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, input_c0_dispatch, NULL },
@@ -562,7 +563,7 @@
 };
 
 /* dcs_enter state table. */
-const struct input_transition input_state_dcs_enter_table[] = {
+static const struct input_transition input_state_dcs_enter_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,		  NULL },
@@ -580,7 +581,7 @@
 };
 
 /* dcs_parameter state table. */
-const struct input_transition input_state_dcs_parameter_table[] = {
+static const struct input_transition input_state_dcs_parameter_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,		  NULL },
@@ -598,7 +599,7 @@
 };
 
 /* dcs_interm state table. */
-const struct input_transition input_state_dcs_intermediate_table[] = {
+static const struct input_transition input_state_dcs_intermediate_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,		  NULL },
@@ -613,7 +614,7 @@
 };
 
 /* dcs_handler state table. */
-const struct input_transition input_state_dcs_handler_table[] = {
+static const struct input_transition input_state_dcs_handler_table[] = {
 	/* No INPUT_STATE_ANYWHERE */
 
 	{ 0x00, 0x1a, input_input,  NULL },
@@ -624,7 +625,7 @@
 };
 
 /* dcs_escape state table. */
-const struct input_transition input_state_dcs_escape_table[] = {
+static const struct input_transition input_state_dcs_escape_table[] = {
 	/* No INPUT_STATE_ANYWHERE */
 
 	{ 0x00, 0x5b, input_input,	  &input_state_dcs_handler },
@@ -635,7 +636,7 @@
 };
 
 /* dcs_ignore state table. */
-const struct input_transition input_state_dcs_ignore_table[] = {
+static const struct input_transition input_state_dcs_ignore_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,	    NULL },
@@ -647,7 +648,7 @@
 };
 
 /* osc_string state table. */
-const struct input_transition input_state_osc_string_table[] = {
+static const struct input_transition input_state_osc_string_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x06, NULL,	    NULL },
@@ -661,7 +662,7 @@
 };
 
 /* apc_string state table. */
-const struct input_transition input_state_apc_string_table[] = {
+static const struct input_transition input_state_apc_string_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,	    NULL },
@@ -673,7 +674,7 @@
 };
 
 /* rename_string state table. */
-const struct input_transition input_state_rename_string_table[] = {
+static const struct input_transition input_state_rename_string_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,	    NULL },
@@ -685,7 +686,7 @@
 };
 
 /* consume_st state table. */
-const struct input_transition input_state_consume_st_table[] = {
+static const struct input_transition input_state_consume_st_table[] = {
 	INPUT_STATE_ANYWHERE,
 
 	{ 0x00, 0x17, NULL,	    NULL },
@@ -697,7 +698,7 @@
 };
 
 /* utf8_three state table. */
-const struct input_transition input_state_utf8_three_table[] = {
+static const struct input_transition input_state_utf8_three_table[] = {
 	/* No INPUT_STATE_ANYWHERE */
 
 	{ 0x00, 0x7f, NULL,		&input_state_ground },
@@ -708,7 +709,7 @@
 };
 
 /* utf8_two state table. */
-const struct input_transition input_state_utf8_two_table[] = {
+static const struct input_transition input_state_utf8_two_table[] = {
 	/* No INPUT_STATE_ANYWHERE */
 
 	{ 0x00, 0x7f, NULL,	      &input_state_ground },
@@ -719,7 +720,7 @@
 };
 
 /* utf8_one state table. */
-const struct input_transition input_state_utf8_one_table[] = {
+static const struct input_transition input_state_utf8_one_table[] = {
 	/* No INPUT_STATE_ANYWHERE */
 
 	{ 0x00, 0x7f, NULL,		&input_state_ground },
@@ -730,7 +731,7 @@
 };
 
 /* Input table compare. */
-int
+static int
 input_table_compare(const void *key, const void *value)
 {
 	const struct input_ctx		*ictx = key;
@@ -742,7 +743,7 @@
 }
 
 /* Reset cell state to default. */
-void
+static void
 input_reset_cell(struct input_ctx *ictx)
 {
 	memcpy(&ictx->cell.cell, &grid_default_cell, sizeof ictx->cell.cell);
@@ -821,7 +822,7 @@
 }
 
 /* Change input state. */
-void
+static void
 input_set_state(struct window_pane *wp, const struct input_transition *itr)
 {
 	struct input_ctx	*ictx = wp->ictx;
@@ -906,7 +907,7 @@
 }
 
 /* Split the parameter list (if any). */
-int
+static int
 input_split(struct input_ctx *ictx)
 
 {
@@ -937,7 +938,7 @@
 }
 
 /* Get an argument or return default value. */
-int
+static int
 input_get(struct input_ctx *ictx, u_int validx, int minval, int defval)
 {
 	int	retval;
@@ -954,7 +955,7 @@
 }
 
 /* Reply to terminal query. */
-void
+static void
 input_reply(struct input_ctx *ictx, const char *fmt, ...)
 {
 	va_list	ap;
@@ -969,7 +970,7 @@
 }
 
 /* Clear saved state. */
-void
+static void
 input_clear(struct input_ctx *ictx)
 {
 	*ictx->interm_buf = '\0';
@@ -985,7 +986,7 @@
 }
 
 /* Reset for ground state. */
-void
+static void
 input_ground(struct input_ctx *ictx)
 {
 	evbuffer_drain(ictx->since_ground, EVBUFFER_LENGTH(ictx->since_ground));
@@ -997,7 +998,7 @@
 }
 
 /* Output this character to the screen. */
-int
+static int
 input_print(struct input_ctx *ictx)
 {
 	int	set;
@@ -1017,7 +1018,7 @@
 }
 
 /* Collect intermediate string. */
-int
+static int
 input_intermediate(struct input_ctx *ictx)
 {
 	if (ictx->interm_len == (sizeof ictx->interm_buf) - 1)
@@ -1031,7 +1032,7 @@
 }
 
 /* Collect parameter string. */
-int
+static int
 input_parameter(struct input_ctx *ictx)
 {
 	if (ictx->param_len == (sizeof ictx->param_buf) - 1)
@@ -1045,7 +1046,7 @@
 }
 
 /* Collect input string. */
-int
+static int
 input_input(struct input_ctx *ictx)
 {
 	size_t available;
@@ -1067,7 +1068,7 @@
 }
 
 /* Execute C0 control sequence. */
-int
+static int
 input_c0_dispatch(struct input_ctx *ictx)
 {
 	struct screen_write_ctx	*sctx = &ictx->ctx;
@@ -1120,7 +1121,7 @@
 }
 
 /* Execute escape sequence. */
-int
+static int
 input_esc_dispatch(struct input_ctx *ictx)
 {
 	struct screen_write_ctx		*sctx = &ictx->ctx;
@@ -1193,7 +1194,7 @@
 }
 
 /* Execute control sequence. */
-int
+static int
 input_csi_dispatch(struct input_ctx *ictx)
 {
 	struct screen_write_ctx	       *sctx = &ictx->ctx;
@@ -1410,7 +1411,7 @@
 }
 
 /* Handle CSI RM. */
-void
+static void
 input_csi_dispatch_rm(struct input_ctx *ictx)
 {
 	u_int	i;
@@ -1431,7 +1432,7 @@
 }
 
 /* Handle CSI private RM. */
-void
+static void
 input_csi_dispatch_rm_private(struct input_ctx *ictx)
 {
 	struct window_pane	*wp = ictx->wp;
@@ -1487,7 +1488,7 @@
 }
 
 /* Handle CSI SM. */
-void
+static void
 input_csi_dispatch_sm(struct input_ctx *ictx)
 {
 	u_int	i;
@@ -1508,7 +1509,7 @@
 }
 
 /* Handle CSI private SM. */
-void
+static void
 input_csi_dispatch_sm_private(struct input_ctx *ictx)
 {
 	struct window_pane	*wp = ictx->wp;
@@ -1570,7 +1571,7 @@
 }
 
 /* Handle CSI window operations. */
-void
+static void
 input_csi_dispatch_winops(struct input_ctx *ictx)
 {
 	struct window_pane	*wp = ictx->wp;
@@ -1619,7 +1620,7 @@
 }
 
 /* Handle CSI SGR for 256 colours. */
-void
+static void
 input_csi_dispatch_sgr_256(struct input_ctx *ictx, int fgbg, u_int *i)
 {
 	struct grid_cell	*gc = &ictx->cell.cell;
@@ -1641,7 +1642,7 @@
 }
 
 /* Handle CSI SGR for RGB colours. */
-void
+static void
 input_csi_dispatch_sgr_rgb(struct input_ctx *ictx, int fgbg, u_int *i)
 {
 	struct grid_cell	*gc = &ictx->cell.cell;
@@ -1667,7 +1668,7 @@
 }
 
 /* Handle CSI SGR. */
-void
+static void
 input_csi_dispatch_sgr(struct input_ctx *ictx)
 {
 	struct grid_cell	*gc = &ictx->cell.cell;
@@ -1787,7 +1788,7 @@
 }
 
 /* DCS terminator (ST) received. */
-int
+static int
 input_dcs_dispatch(struct input_ctx *ictx)
 {
 	const char	prefix[] = "tmux;";
@@ -1809,7 +1810,7 @@
 }
 
 /* OSC string started. */
-void
+static void
 input_enter_osc(struct input_ctx *ictx)
 {
 	log_debug("%s", __func__);
@@ -1818,7 +1819,7 @@
 }
 
 /* OSC terminator (ST) received. */
-void
+static void
 input_exit_osc(struct input_ctx *ictx)
 {
 	u_char	*p = ictx->input_buf;
@@ -1858,7 +1859,7 @@
 }
 
 /* APC string started. */
-void
+static void
 input_enter_apc(struct input_ctx *ictx)
 {
 	log_debug("%s", __func__);
@@ -1867,7 +1868,7 @@
 }
 
 /* APC terminator (ST) received. */
-void
+static void
 input_exit_apc(struct input_ctx *ictx)
 {
 	if (ictx->flags & INPUT_DISCARD)
@@ -1879,7 +1880,7 @@
 }
 
 /* Rename string started. */
-void
+static void
 input_enter_rename(struct input_ctx *ictx)
 {
 	log_debug("%s", __func__);
@@ -1888,7 +1889,7 @@
 }
 
 /* Rename terminator (ST) received. */
-void
+static void
 input_exit_rename(struct input_ctx *ictx)
 {
 	if (ictx->flags & INPUT_DISCARD)
@@ -1904,7 +1905,7 @@
 }
 
 /* Open UTF-8 character. */
-int
+static int
 input_utf8_open(struct input_ctx *ictx)
 {
 	struct utf8_data	*ud = &ictx->utf8data;
@@ -1918,7 +1919,7 @@
 }
 
 /* Append to UTF-8 character. */
-int
+static int
 input_utf8_add(struct input_ctx *ictx)
 {
 	struct utf8_data	*ud = &ictx->utf8data;
@@ -1932,7 +1933,7 @@
 }
 
 /* Close UTF-8 string. */
-int
+static int
 input_utf8_close(struct input_ctx *ictx)
 {
 	struct utf8_data	*ud = &ictx->utf8data;