From 9d6f50a6081168abec388396ae594be3072f2857 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 8 May 2015 15:56:49 +0000 Subject: [PATCH] Remove some stuff that accidentally ended up here from portable, and remove a little-used debug function. --- usr.bin/tmux/grid.c | 31 +++++++++++-------------------- usr.bin/tmux/server-client.c | 7 +------ 2 files changed, 12 insertions(+), 26 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 @@ -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 * diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index aea57e59468..7e873627922 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.137 2015/05/06 07:52:06 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.138 2015/05/08 15:56:49 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -1178,11 +1178,6 @@ server_client_msg_identify(struct client *c, struct imsg *imsg) return; c->flags |= CLIENT_IDENTIFIED; -#ifdef __CYGWIN__ - c->fd = open(c->ttyname, O_RDWR|O_NOCTTY); - c->cwd = open(".", O_RDONLY); -#endif - if (c->flags & CLIENT_CONTROL) { c->stdin_callback = control_callback; -- 2.20.1