circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-19 10:58:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-12-03 12:01:26 +00:00
commit 875139f5fa
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
attributes.c
View File

@ -59,8 +59,8 @@ attributes_fromstring(const char *str)
size_t end; size_t end;
u_int i; u_int i;
struct { struct {
const char* name; const char *name;
int attr; int attr;
} table[] = { } table[] = {
{ "bright", GRID_ATTR_BRIGHT }, { "bright", GRID_ATTR_BRIGHT },
{ "bold", GRID_ATTR_BRIGHT }, { "bold", GRID_ATTR_BRIGHT },

2
grid.c
View File

@ -204,7 +204,7 @@ grid_clear_cell(struct grid *gd, u_int px, u_int py, u_int bg)
/* Check grid y position. */ /* Check grid y position. */
static int 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) { if (py >= gd->hsize + gd->sy) {
log_debug("%s: y out of range: %u", from, py); log_debug("%s: y out of range: %u", from, py);

2
options.c
View File

@ -610,7 +610,7 @@ options_match(const char *s, int *idx, int *ambiguous)
struct options_entry * struct options_entry *
options_match_get(struct options *oo, const char *s, int *idx, int only, options_match_get(struct options *oo, const char *s, int *idx, int only,
int* ambiguous) int *ambiguous)
{ {
char *name; char *name;
struct options_entry *o; struct options_entry *o;

2
server-client.c
View File

@ -1579,7 +1579,7 @@ server_client_check_exit(struct client *c)
/* Redraw timer callback. */ /* Redraw timer callback. */
static void static void
server_client_redraw_timer(__unused int fd, __unused short events, server_client_redraw_timer(__unused int fd, __unused short events,
__unused void* data) __unused void *data)
{ {
log_debug("redraw timer fired"); log_debug("redraw timer fired");
} }

4
window-buffer.c
View File

@ -333,7 +333,7 @@ window_buffer_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
} }
static void 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) __unused struct client *c, __unused key_code key)
{ {
struct window_buffer_modedata *data = modedata; struct window_buffer_modedata *data = modedata;
@ -347,7 +347,7 @@ window_buffer_do_delete(void* modedata, void *itemdata,
} }
static void 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) __unused key_code key)
{ {
struct window_buffer_modedata *data = modedata; struct window_buffer_modedata *data = modedata;

2
window-client.c
View File

@ -313,7 +313,7 @@ window_client_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
} }
static void 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) __unused struct client *c, key_code key)
{ {
struct window_client_modedata *data = modedata; struct window_client_modedata *data = modedata;

8
window-tree.c
View File

@ -317,7 +317,7 @@ window_tree_filter_pane(struct session *s, struct winlink *wl,
static int static int
window_tree_build_window(struct session *s, struct winlink *wl, 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 mode_tree_item *parent, const char *filter)
{ {
struct window_tree_modedata *data = modedata; struct window_tree_modedata *data = modedata;
@ -383,7 +383,7 @@ empty:
} }
static void 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 mode_tree_sort_criteria *sort_crit, const char *filter)
{ {
struct window_tree_modedata *data = modedata; struct window_tree_modedata *data = modedata;
@ -973,7 +973,7 @@ window_tree_get_target(struct window_tree_itemdata *item,
} }
static void 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) __unused key_code key)
{ {
struct window_tree_modedata *data = modedata; struct window_tree_modedata *data = modedata;
@ -1030,7 +1030,7 @@ window_tree_command_free(void *modedata)
} }
static void 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) __unused struct client *c, __unused key_code key)
{ {
struct window_tree_itemdata *item = itemdata; struct window_tree_itemdata *item = itemdata;