diff options
author | Thomas Adam <thomas@xteddy.org> | 2023-07-01 02:01:10 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2023-07-01 02:01:10 +0100 |
commit | 9cf58d1a52adf4c2d2d93b0bc455ffa8dbb134e9 (patch) | |
tree | 4c365a77c603d800492fa4da0d4c6c72c9a10f44 | |
parent | 237ee6f2311b351b8a3bb3b46e17622f6e3b6bb9 (diff) | |
parent | a2a02fd7d75a9d866570261fd428fefa773a6bf8 (diff) |
Merge branch 'obsd-master'
-rw-r--r-- | arguments.c | 2 | ||||
-rw-r--r-- | grid.c | 3 | ||||
-rw-r--r-- | regsub.c | 4 | ||||
-rw-r--r-- | utf8.c | 2 | ||||
-rw-r--r-- | window-tree.c | 4 |
5 files changed, 8 insertions, 7 deletions
diff --git a/arguments.c b/arguments.c index 387790ac..f3152ddf 100644 --- a/arguments.c +++ b/arguments.c @@ -189,7 +189,7 @@ out: /* Parse flags argument. */ static int args_parse_flags(const struct args_parse *parse, struct args_value *values, - u_int count, char **cause, struct args *args, int *i) + u_int count, char **cause, struct args *args, u_int *i) { struct args_value *value; u_char flag; @@ -1044,7 +1044,8 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx, const char *data; char *buf, code[8192]; size_t len, off, size, codelen; - u_int xx, has_link = 0, end; + u_int xx, end; + int has_link = 0; const struct grid_line *gl; if (lastgc != NULL && *lastgc == NULL) { @@ -24,7 +24,7 @@ #include "tmux.h" static void -regsub_copy(char **buf, size_t *len, const char *text, size_t start, size_t end) +regsub_copy(char **buf, ssize_t *len, const char *text, size_t start, size_t end) { size_t add = end - start; @@ -34,7 +34,7 @@ regsub_copy(char **buf, size_t *len, const char *text, size_t start, size_t end) } static void -regsub_expand(char **buf, size_t *len, const char *with, const char *text, +regsub_expand(char **buf, ssize_t *len, const char *with, const char *text, regmatch_t *m, u_int n) { const char *cp; @@ -94,7 +94,7 @@ utf8_item_by_index(u_int index) /* Add a UTF-8 item. */ static int -utf8_put_item(const char *data, size_t size, u_int *index) +utf8_put_item(const u_char *data, size_t size, u_int *index) { struct utf8_item *ui; diff --git a/window-tree.c b/window-tree.c index 1be47017..b2f397f5 100644 --- a/window-tree.c +++ b/window-tree.c @@ -671,9 +671,9 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s, struct window_pane *wp; u_int cx = ctx->s->cx, cy = ctx->s->cy; u_int loop, total, visible, each, width, offset; - u_int current, start, end, remaining, i; + u_int current, start, end, remaining, i, pane_idx; struct grid_cell gc; - int colour, active_colour, left, right, pane_idx; + int colour, active_colour, left, right; char *label; total = window_count_panes(w); |