diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-01-19 18:01:15 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-01-19 18:01:15 +0000 |
| commit | dc42c35f1f04d3bd431c52dde0906965c6db2d6c (patch) | |
| tree | 6b9e46226bd4ef64ab3e1c5c8bd65bdbc3cce3b9 /cmd-queue.c | |
| parent | 5d21faa99c9a005208e88be72ef2c1e02cf6d128 (diff) | |
| parent | b5b5221c13ded5b141fa35f60c707c9c403b83a6 (diff) | |
| download | rtmux-dc42c35f1f04d3bd431c52dde0906965c6db2d6c.tar.gz rtmux-dc42c35f1f04d3bd431c52dde0906965c6db2d6c.tar.bz2 rtmux-dc42c35f1f04d3bd431c52dde0906965c6db2d6c.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 5bc3226a..1c80c59d 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -1,7 +1,7 @@ /* $OpenBSD$ */ /* - * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net> + * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -199,7 +199,7 @@ cmdq_continue_one(struct cmd_q *cmdq) cmdq_guard(cmdq, "begin", flags); - if (cmd_prepare_state(cmd, cmdq) != 0) + if (cmd_prepare_state(cmd, cmdq, NULL) != 0) goto error; retval = cmd->entry->exec(cmd, cmdq); if (retval == CMD_RETURN_ERROR) |