diff options
| author |   nicm <nicm@openbsd.org> | 2015-05-08 15:56:49 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-05-08 15:56:49 +0000 |
| commit | 9d6f50a6081168abec388396ae594be3072f2857 (patch) | |
| tree | 051965fa5420be5f4d27594fd09f75cd673eddee /usr.bin/tmux/grid.c | |
| parent | Remove ereply prototype since it is never used. Tweak a comment to reflect (diff) | |
| download | wireguard-openbsd-9d6f50a6081168abec388396ae594be3072f2857.tar.xz wireguard-openbsd-9d6f50a6081168abec388396ae594be3072f2857.zip | |
Remove some stuff that accidentally ended up here from portable, and
remove a little-used debug function.
Diffstat (limited to 'usr.bin/tmux/grid.c')
| -rw-r--r-- | usr.bin/tmux/grid.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index 0e2850d2e60..e2d1cd500a2 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.42 2015/04/23 07:45:50 deraadt Exp $ */ +/* $OpenBSD: grid.c,v 1.43 2015/05/08 15:56:49 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -49,15 +49,16 @@ const struct grid_cell grid_default_cell = { 0, 0, 8, 8, (1 << 4) | 1, " " }; int grid_check_y(struct grid *, u_int); -#ifdef DEBUG -int -grid_check_y(struct grid *gd, u_int py) -{ - if ((py) >= (gd)->hsize + (gd)->sy) - log_fatalx("y out of range: %u", py); - return (0); -} -#else +void grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int); +void grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int, + u_int); +void grid_reflow_move(struct grid *, u_int *, struct grid_line *); +size_t grid_string_cells_fg(const struct grid_cell *, int *); +size_t grid_string_cells_bg(const struct grid_cell *, int *); +void grid_string_cells_code(const struct grid_cell *, + const struct grid_cell *, char *, size_t, int); + +/* Check grid y position. */ int grid_check_y(struct grid *gd, u_int py) { @@ -67,16 +68,6 @@ grid_check_y(struct grid *gd, u_int py) } return (0); } -#endif - -void grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int); -void grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int, - u_int); -void grid_reflow_move(struct grid *, u_int *, struct grid_line *); -size_t grid_string_cells_fg(const struct grid_cell *, int *); -size_t grid_string_cells_bg(const struct grid_cell *, int *); -void grid_string_cells_code(const struct grid_cell *, - const struct grid_cell *, char *, size_t, int); /* Create a new grid. */ struct grid * |