diff options
| author | Thomas Adam <thomas.adam@smoothwall.net> | 2013-03-25 14:59:29 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas.adam@smoothwall.net> | 2013-03-25 14:59:29 +0000 |
| commit | f90eb43fcb12720711ea01b110c5b474111e6600 (patch) | |
| tree | 43b2e85bcf1626e3810ade10578ac18399931772 /cmd-lock-server.c | |
| parent | 418ba99078a2712ece398e17a5a9bc1f6600126b (diff) | |
| parent | 58bb6f8c5650d496fb3b872766c0278aa024631d (diff) | |
| download | rtmux-f90eb43fcb12720711ea01b110c5b474111e6600.tar.gz rtmux-f90eb43fcb12720711ea01b110c5b474111e6600.tar.bz2 rtmux-f90eb43fcb12720711ea01b110c5b474111e6600.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-lock-server.c')
| -rw-r--r-- | cmd-lock-server.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmd-lock-server.c b/cmd-lock-server.c index 9d650275..0b6aafe8 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -28,7 +28,7 @@ * Lock commands. */ -enum cmd_retval cmd_lock_server_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_lock_server_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_lock_server_entry = { "lock-server", "lock", @@ -60,9 +60,8 @@ const struct cmd_entry cmd_lock_client_entry = { cmd_lock_server_exec }; -/* ARGSUSED */ enum cmd_retval -cmd_lock_server_exec(struct cmd *self, unused struct cmd_ctx *ctx) +cmd_lock_server_exec(struct cmd *self, unused struct cmd_q *cmdq) { struct args *args = self->args; struct client *c; @@ -71,11 +70,13 @@ cmd_lock_server_exec(struct cmd *self, unused struct cmd_ctx *ctx) if (self->entry == &cmd_lock_server_entry) server_lock(); else if (self->entry == &cmd_lock_session_entry) { - if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL) + s = cmd_find_session(cmdq, args_get(args, 't'), 0); + if (s == NULL) return (CMD_RETURN_ERROR); server_lock_session(s); } else { - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + c = cmd_find_client(cmdq, args_get(args, 't'), 0); + if (c == NULL) return (CMD_RETURN_ERROR); server_lock_client(c); } |