diff options
| author |   nicm <nicm@openbsd.org> | 2019-05-20 11:46:06 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2019-05-20 11:46:06 +0000 |
| commit | 0f3d1a91ca8aa75d7fe08275ad88a34052712685 (patch) | |
| tree | e3dd22800fc81d9ef941b1324c2e93e83e95a5a2 /usr.bin/tmux/server-client.c | |
| parent | Add a helper to allocate a cmd_list. (diff) | |
| download | wireguard-openbsd-0f3d1a91ca8aa75d7fe08275ad88a34052712685.tar.xz wireguard-openbsd-0f3d1a91ca8aa75d7fe08275ad88a34052712685.zip | |
Replace the various identical error callbacks with a single one in cmd-queue.c.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 5275368661d..41562901392 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.283 2019/05/12 18:16:33 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.284 2019/05/20 11:46:06 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1768,18 +1768,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) @@ -1827,7 +1815,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); |