diff options
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/attributes.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/grid.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/options.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/server-client.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/window-buffer.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/window-client.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/window-tree.c | 10 |
7 files changed, 19 insertions, 19 deletions
diff --git a/usr.bin/tmux/attributes.c b/usr.bin/tmux/attributes.c index 39a24e17751..014fe10e8b7 100644 --- a/usr.bin/tmux/attributes.c +++ b/usr.bin/tmux/attributes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: attributes.c,v 1.9 2019/05/13 20:10:23 nicm Exp $ */ +/* $OpenBSD: attributes.c,v 1.10 2019/12/03 10:47:22 nicm Exp $ */ /* * Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org> @@ -59,8 +59,8 @@ attributes_fromstring(const char *str) size_t end; u_int i; struct { - const char* name; - int attr; + const char *name; + int attr; } table[] = { { "bright", GRID_ATTR_BRIGHT }, { "bold", GRID_ATTR_BRIGHT }, diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index 3c6fa2e6ec6..3cebc7f42e9 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.100 2019/09/24 20:44:58 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.101 2019/12/03 10:47:22 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -204,7 +204,7 @@ grid_clear_cell(struct grid *gd, u_int px, u_int py, u_int bg) /* Check grid y position. */ static int -grid_check_y(struct grid *gd, const char* from, u_int py) +grid_check_y(struct grid *gd, const char *from, u_int py) { if (py >= gd->hsize + gd->sy) { log_debug("%s: y out of range: %u", from, py); diff --git a/usr.bin/tmux/options.c b/usr.bin/tmux/options.c index 046dc5b21f2..aaccaa126bd 100644 --- a/usr.bin/tmux/options.c +++ b/usr.bin/tmux/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.54 2019/10/15 08:30:36 nicm Exp $ */ +/* $OpenBSD: options.c,v 1.55 2019/12/03 10:47:22 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -610,7 +610,7 @@ options_match(const char *s, int *idx, int *ambiguous) struct options_entry * options_match_get(struct options *oo, const char *s, int *idx, int only, - int* ambiguous) + int *ambiguous) { char *name; struct options_entry *o; diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 1647ea0a365..d6e6e225ebd 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.298 2019/11/28 09:56:25 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.299 2019/12/03 10:47:22 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1581,7 +1581,7 @@ server_client_check_exit(struct client *c) /* Redraw timer callback. */ static void server_client_redraw_timer(__unused int fd, __unused short events, - __unused void* data) + __unused void *data) { log_debug("redraw timer fired"); } diff --git a/usr.bin/tmux/window-buffer.c b/usr.bin/tmux/window-buffer.c index a29bec4d8af..9a9d836eee5 100644 --- a/usr.bin/tmux/window-buffer.c +++ b/usr.bin/tmux/window-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-buffer.c,v 1.22 2019/08/16 11:49:12 nicm Exp $ */ +/* $OpenBSD: window-buffer.c,v 1.23 2019/12/03 10:47:23 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -334,7 +334,7 @@ window_buffer_resize(struct window_mode_entry *wme, u_int sx, u_int sy) } static void -window_buffer_do_delete(void* modedata, void *itemdata, +window_buffer_do_delete(void *modedata, void *itemdata, __unused struct client *c, __unused key_code key) { struct window_buffer_modedata *data = modedata; @@ -348,7 +348,7 @@ window_buffer_do_delete(void* modedata, void *itemdata, } static void -window_buffer_do_paste(void* modedata, void *itemdata, struct client *c, +window_buffer_do_paste(void *modedata, void *itemdata, struct client *c, __unused key_code key) { struct window_buffer_modedata *data = modedata; diff --git a/usr.bin/tmux/window-client.c b/usr.bin/tmux/window-client.c index d37870d4b07..49591ef0ddc 100644 --- a/usr.bin/tmux/window-client.c +++ b/usr.bin/tmux/window-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-client.c,v 1.24 2019/08/16 11:49:12 nicm Exp $ */ +/* $OpenBSD: window-client.c,v 1.25 2019/12/03 10:47:23 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -313,7 +313,7 @@ window_client_resize(struct window_mode_entry *wme, u_int sx, u_int sy) } static void -window_client_do_detach(void* modedata, void *itemdata, +window_client_do_detach(void *modedata, void *itemdata, __unused struct client *c, key_code key) { struct window_client_modedata *data = modedata; diff --git a/usr.bin/tmux/window-tree.c b/usr.bin/tmux/window-tree.c index 1f3f63732f8..f3349074068 100644 --- a/usr.bin/tmux/window-tree.c +++ b/usr.bin/tmux/window-tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-tree.c,v 1.42 2019/10/15 08:30:36 nicm Exp $ */ +/* $OpenBSD: window-tree.c,v 1.43 2019/12/03 10:47:23 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -317,7 +317,7 @@ window_tree_filter_pane(struct session *s, struct winlink *wl, static int window_tree_build_window(struct session *s, struct winlink *wl, - void* modedata, struct mode_tree_sort_criteria *sort_crit, + void *modedata, struct mode_tree_sort_criteria *sort_crit, struct mode_tree_item *parent, const char *filter) { struct window_tree_modedata *data = modedata; @@ -383,7 +383,7 @@ empty: } static void -window_tree_build_session(struct session *s, void* modedata, +window_tree_build_session(struct session *s, void *modedata, struct mode_tree_sort_criteria *sort_crit, const char *filter) { struct window_tree_modedata *data = modedata; @@ -973,7 +973,7 @@ window_tree_get_target(struct window_tree_itemdata *item, } static void -window_tree_command_each(void* modedata, void* itemdata, struct client *c, +window_tree_command_each(void *modedata, void *itemdata, struct client *c, __unused key_code key) { struct window_tree_modedata *data = modedata; @@ -1030,7 +1030,7 @@ window_tree_command_free(void *modedata) } static void -window_tree_kill_each(__unused void* modedata, void* itemdata, +window_tree_kill_each(__unused void *modedata, void *itemdata, __unused struct client *c, __unused key_code key) { struct window_tree_itemdata *item = itemdata; |