diff options
| author | nicm <nicm> | 2014-10-27 22:23:47 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2014-10-27 22:23:47 +0000 |
| commit | b496b1fe11b99614e407d02edb1a21905f384929 (patch) | |
| tree | 04f86af517474a5486ba8767bc2cdc8c5e102d26 /cmd-queue.c | |
| parent | 428b51e03187f13ccaf1451fb89d53848facab6d (diff) | |
| download | rtmux-b496b1fe11b99614e407d02edb1a21905f384929.tar.gz rtmux-b496b1fe11b99614e407d02edb1a21905f384929.tar.bz2 rtmux-b496b1fe11b99614e407d02edb1a21905f384929.zip | |
Move cfg_causes local into cfg.c and remove struct causelist.
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 0ddf90f7..a98fa9b6 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -93,17 +93,16 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...) struct client *c = cmdq->client; struct cmd *cmd = cmdq->cmd; va_list ap; - char *msg, *cause; + char *msg; size_t msglen; va_start(ap, fmt); msglen = xvasprintf(&msg, fmt, ap); va_end(ap); - if (c == NULL) { - xasprintf(&cause, "%s:%u: %s", cmd->file, cmd->line, msg); - ARRAY_ADD(&cfg_causes, cause); - } else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) { + if (c == NULL) + cfg_add_cause("%s:%u: %s", cmd->file, cmd->line, msg); + else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) { evbuffer_add(c->stderr_data, msg, msglen); evbuffer_add(c->stderr_data, "\n", 1); |