summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-09-02 17:43:25 +0000
committernicm <nicm@openbsd.org>2015-09-02 17:43:25 +0000
commite42da932f4c82db5b44b4a826372ee971d682de4 (patch)
tree60bf5105915651633d23a4fa53a60f72a21544bb
parentWe no longer need the terminal service class, so don't bother asking for it. (diff)
downloadwireguard-openbsd-e42da932f4c82db5b44b4a826372ee971d682de4.tar.xz
wireguard-openbsd-e42da932f4c82db5b44b4a826372ee971d682de4.zip
A one line helper function is a little silly.
-rw-r--r--usr.bin/tmux/alerts.c6
-rw-r--r--usr.bin/tmux/tmux.h3
-rw-r--r--usr.bin/tmux/tty.c8
3 files changed, 5 insertions, 12 deletions
diff --git a/usr.bin/tmux/alerts.c b/usr.bin/tmux/alerts.c
index baa5bb0d9b9..985e1dcb50e 100644
--- a/usr.bin/tmux/alerts.c
+++ b/usr.bin/tmux/alerts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alerts.c,v 1.1 2015/08/29 08:30:54 nicm Exp $ */
+/* $OpenBSD: alerts.c,v 1.2 2015/09/02 17:43:25 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -174,7 +174,7 @@ alerts_check_bell(struct session *s, struct winlink *wl)
(action == BELL_OTHER &&
c->session->curw->window != w) ||
action == BELL_ANY)
- tty_bell(&c->tty);
+ tty_putcode(&c->tty, TTYC_BEL);
continue;
}
if (action == BELL_CURRENT && c->session->curw->window == w)
@@ -258,6 +258,6 @@ alerts_ring_bell(struct session *s)
TAILQ_FOREACH(c, &clients, entry) {
if (c->session == s && !(c->flags & CLIENT_CONTROL))
- tty_bell(&c->tty);
+ tty_putcode(&c->tty, TTYC_BEL);
}
}
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 18344e1773b..50681a968a1 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.553 2015/09/02 17:37:54 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.554 2015/09/02 17:43:25 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1596,7 +1596,6 @@ void tty_cmd_utf8character(struct tty *, const struct tty_ctx *);
void tty_cmd_reverseindex(struct tty *, const struct tty_ctx *);
void tty_cmd_setselection(struct tty *, const struct tty_ctx *);
void tty_cmd_rawstring(struct tty *, const struct tty_ctx *);
-void tty_bell(struct tty *);
/* tty-term.c */
extern struct tty_terms tty_terms;
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index adcfe46391e..7e6b07e5950 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.186 2015/09/02 17:37:54 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.187 2015/09/02 17:43:25 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1712,9 +1712,3 @@ tty_default_colours(struct grid_cell *gc, const struct window_pane *wp)
}
}
}
-
-void
-tty_bell(struct tty *tty)
-{
- tty_putcode(tty, TTYC_BEL);
-}