aboutsummaryrefslogtreecommitdiff
path: root/cmd-queue.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-01-31 21:39:56 +0000
committerThomas Adam <thomas@xteddy.org>2014-01-31 21:39:56 +0000
commitd50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987 (patch)
tree397f4999444c2eef367f884b815bec2a14697c3c /cmd-queue.c
parentcbf9224c5f7bcf07352f6ea128c90c12cb0af22e (diff)
parent9f02feb9d089b1a4639afb52ab0e8212eeb55a7c (diff)
downloadrtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.gz
rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.bz2
rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.zip
Merge branch 'obsd-master'
Conflicts: Makefile cmd-server-info.c cmd-start-server.c
Diffstat (limited to 'cmd-queue.c')
-rw-r--r--cmd-queue.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd-queue.c b/cmd-queue.c
index c5905bdb..17955b82 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -69,9 +69,7 @@ cmdq_print(struct cmd_q *cmdq, const char *fmt, ...)
if (c == NULL)
/* nothing */;
else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
- va_start(ap, fmt);
evbuffer_add_vprintf(c->stdout_data, fmt, ap);
- va_end(ap);
evbuffer_add(c->stdout_data, "\n", 1);
server_push_stdout(c);
@@ -104,9 +102,7 @@ cmdq_info(struct cmd_q *cmdq, const char *fmt, ...)
if (c == NULL)
/* nothing */;
else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
- va_start(ap, fmt);
evbuffer_add_vprintf(c->stdout_data, fmt, ap);
- va_end(ap);
evbuffer_add(c->stdout_data, "\n", 1);
server_push_stdout(c);