diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-05-20 15:02:40 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-05-20 15:02:40 +0100 |
| commit | 98ee93bde39b608fbcdca3b246b7d2088740f7cb (patch) | |
| tree | 8772ddfccea6237ae2b6635ef192ef39fe2b82e7 /server-client.c | |
| parent | 3a7e15511ba3353588cdf61c0d195699bcb0dcbc (diff) | |
| parent | 87d82170a615007bbd2f880765f222dd5c263000 (diff) | |
| download | rtmux-98ee93bde39b608fbcdca3b246b7d2088740f7cb.tar.gz rtmux-98ee93bde39b608fbcdca3b246b7d2088740f7cb.tar.bz2 rtmux-98ee93bde39b608fbcdca3b246b7d2088740f7cb.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/server-client.c b/server-client.c index b61c1fa9..47c513fc 100644 --- a/server-client.c +++ b/server-client.c @@ -1778,18 +1778,6 @@ server_client_command_done(struct cmdq_item *item, __unused void *data) return (CMD_RETURN_NORMAL); } -/* Show an error message. */ -static enum cmd_retval -server_client_command_error(struct cmdq_item *item, void *data) -{ - char *error = data; - - cmdq_error(item, "%s", error); - free(error); - - return (CMD_RETURN_NORMAL); -} - /* Handle command message. */ static void server_client_dispatch_command(struct client *c, struct imsg *imsg) @@ -1837,7 +1825,8 @@ server_client_dispatch_command(struct client *c, struct imsg *imsg) return; error: - cmdq_append(c, cmdq_get_callback(server_client_command_error, cause)); + cmdq_append(c, cmdq_get_error(cause)); + free(cause); if (cmdlist != NULL) cmd_list_free(cmdlist); |