diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-03-28 19:44:32 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-03-28 19:44:32 +0000 |
| commit | 626df37bacde6a1b9b7b102f55347fd04cc7e5ca (patch) | |
| tree | f90872e691e24d9eabc7e368be9dfc8cc5bd5c9f /usr.bin/tmux | |
| parent | f791788b492d95be55d5174a682254b74c54cf9e (diff) | |
Style: uint -> u_int and a missing else.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/paste.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/window-copy.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/tmux/paste.c b/usr.bin/tmux/paste.c index f6cf1c7c1ce..def59f83e18 100644 --- a/usr.bin/tmux/paste.c +++ b/usr.bin/tmux/paste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: paste.c,v 1.10 2010/12/30 23:16:18 nicm Exp $ */ +/* $OpenBSD: paste.c,v 1.11 2011/03/28 19:44:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,7 +31,7 @@ /* Return each item of the stack in turn. */ struct paste_buffer * -paste_walk_stack(struct paste_stack *ps, uint *idx) +paste_walk_stack(struct paste_stack *ps, u_int *idx) { struct paste_buffer *pb; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 6eac590975a..cfe1d27926c 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.275 2011/03/27 20:31:25 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.276 2011/03/28 19:44:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1454,7 +1454,7 @@ void tty_keys_free(struct tty *); int tty_keys_next(struct tty *); /* paste.c */ -struct paste_buffer *paste_walk_stack(struct paste_stack *, uint *); +struct paste_buffer *paste_walk_stack(struct paste_stack *, u_int *); struct paste_buffer *paste_get_top(struct paste_stack *); struct paste_buffer *paste_get_index(struct paste_stack *, u_int); int paste_free_top(struct paste_stack *); diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index 3530de191b3..16c327d6924 100644 --- a/usr.bin/tmux/window-copy.c +++ b/usr.bin/tmux/window-copy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-copy.c,v 1.66 2010/12/30 23:16:18 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.67 2011/03/28 19:44:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -368,8 +368,8 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) if (np == 0) np = 1; - if (data->inputtype == WINDOW_COPY_JUMPFORWARD - || data->inputtype == WINDOW_COPY_JUMPBACK) { + if (data->inputtype == WINDOW_COPY_JUMPFORWARD || + data->inputtype == WINDOW_COPY_JUMPBACK) { /* Ignore keys with modifiers. */ if ((key & KEYC_MASK_MOD) == 0) { data->jumpchar = key; @@ -385,7 +385,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) data->inputtype = WINDOW_COPY_OFF; window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1); return; - } if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) { + } else if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) { if (window_copy_key_numeric_prefix(wp, key) == 0) return; data->inputtype = WINDOW_COPY_OFF; @@ -1617,7 +1617,7 @@ window_copy_cursor_jump(struct window_pane *wp) struct window_copy_mode_data *data = wp->modedata; struct screen *back_s = data->backing; const struct grid_cell *gc; - uint px, py, xx; + u_int px, py, xx; px = data->cx + 1; py = screen_hsize(back_s) + data->cy - data->oy; @@ -1643,7 +1643,7 @@ window_copy_cursor_jump_back(struct window_pane *wp) struct window_copy_mode_data *data = wp->modedata; struct screen *back_s = data->backing; const struct grid_cell *gc; - uint px, py; + u_int px, py; px = data->cx; py = screen_hsize(back_s) + data->cy - data->oy; |