diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
| commit | 1a6e696b08113ca17ee8e881844167cf94276846 (patch) | |
| tree | 60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-set-buffer.c | |
| parent | d401340c516131ae8e07bfb978b670347486d077 (diff) | |
| parent | d15d54c2c8e6b95695169442eb2a27d814efc078 (diff) | |
| download | rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2 rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-buffer.c')
| -rw-r--r-- | cmd-set-buffer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index d3f8ba4f..96fdf450 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -27,7 +27,7 @@ * Add, set, append to or delete a paste buffer. */ -static enum cmd_retval cmd_set_buffer_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_set_buffer_exec(struct cmd *, struct cmdq_item *); const struct cmd_entry cmd_set_buffer_entry = { .name = "set-buffer", @@ -52,7 +52,7 @@ const struct cmd_entry cmd_delete_buffer_entry = { }; static enum cmd_retval -cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; struct paste_buffer *pb; @@ -70,7 +70,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) if (pb == NULL) pb = paste_get_top(&bufname); if (pb == NULL) { - cmdq_error(cmdq, "no buffer"); + cmdq_error(item, "no buffer"); return (CMD_RETURN_ERROR); } paste_free(pb); @@ -81,11 +81,11 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) if (pb == NULL) pb = paste_get_top(&bufname); if (pb == NULL) { - cmdq_error(cmdq, "no buffer"); + cmdq_error(item, "no buffer"); return (CMD_RETURN_ERROR); } if (paste_rename(bufname, args_get(args, 'n'), &cause) != 0) { - cmdq_error(cmdq, "%s", cause); + cmdq_error(item, "%s", cause); free(cause); return (CMD_RETURN_ERROR); } @@ -93,7 +93,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) } if (args->argc != 1) { - cmdq_error(cmdq, "no data specified"); + cmdq_error(item, "no data specified"); return (CMD_RETURN_ERROR); } if ((newsize = strlen(args->argv[0])) == 0) @@ -113,7 +113,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) bufsize += newsize; if (paste_set(bufdata, bufsize, bufname, &cause) != 0) { - cmdq_error(cmdq, "%s", cause); + cmdq_error(item, "%s", cause); free(bufdata); free(cause); return (CMD_RETURN_ERROR); |