diff options
| -rw-r--r-- | usr.bin/tmux/grid.c | 16 | ||||
| -rw-r--r-- | usr.bin/tmux/log.c | 15 | ||||
| -rw-r--r-- | usr.bin/tmux/status.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 4 |
4 files changed, 5 insertions, 34 deletions
diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index d09d2d1684e..be7259a52dc 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.8 2009/07/16 07:34:37 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.9 2009/07/21 18:40:30 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -199,20 +199,6 @@ grid_scroll_line(struct grid *gd) gd->hsize++; } -/* Reduce line to fit to cell. */ -void -grid_reduce_line(struct grid *gd, u_int py, u_int sx) -{ - if (sx < gd->size[py]) { - gd->data[py] = xrealloc(gd->data[py], sx, sizeof **gd->data); - gd->size[py] = sx; - } - if (sx < gd->usize[py]) { - gd->udata[py] = xrealloc(gd->udata[py], sx, sizeof **gd->udata); - gd->usize[py] = sx; - } -} - /* Expand line to fit to cell. */ void grid_expand_line(struct grid *gd, u_int py, u_int sx) diff --git a/usr.bin/tmux/log.c b/usr.bin/tmux/log.c index 79f6925ccee..3812e8f2471 100644 --- a/usr.bin/tmux/log.c +++ b/usr.bin/tmux/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.2 2009/06/25 06:23:10 nicm Exp $ */ +/* $OpenBSD: log.c,v 1.3 2009/07/21 18:40:30 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -171,19 +171,6 @@ log_debug2(const char *msg, ...) } } -/* Log a debug message at level 3. */ -void printflike1 -log_debug3(const char *msg, ...) -{ - va_list ap; - - if (log_level > 2) { - va_start(ap, msg); - log_vwrite(LOG_DEBUG, msg, ap); - va_end(ap); - } -} - /* Log a critical error, with error string if necessary, and die. */ __dead void log_vfatal(const char *msg, va_list ap) diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 1cf520b5d3e..068958546ea 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.15 2009/07/20 14:32:09 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.16 2009/07/21 18:40:30 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -350,7 +350,7 @@ status_replace(struct session *s, const char *fmt, time_t t) wl->window->active)); ptr = tmp; } - /* FALLTHOUGH */ + /* FALLTHROUGH */ case 'S': if (ptr == NULL) ptr = s->name; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index df8814279af..ffadc745d0f 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.42 2009/07/21 18:38:52 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.43 2009/07/21 18:40:30 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1349,7 +1349,6 @@ extern const struct grid_cell grid_default_cell; struct grid *grid_create(u_int, u_int, u_int); void grid_destroy(struct grid *); int grid_compare(struct grid *, struct grid *); -void grid_reduce_line(struct grid *, u_int, u_int); void grid_expand_line(struct grid *, u_int, u_int); void grid_expand_line_utf8(struct grid *, u_int, u_int); void grid_scroll_line(struct grid *); @@ -1603,7 +1602,6 @@ void printflike1 log_warnx(const char *, ...); void printflike1 log_info(const char *, ...); void printflike1 log_debug(const char *, ...); void printflike1 log_debug2(const char *, ...); -void printflike1 log_debug3(const char *, ...); __dead void log_fatal(const char *, ...); __dead void log_fatalx(const char *, ...); |