diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-06-18 09:31:07 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-06-18 09:31:07 +0100 |
| commit | 77f582ff137808cc3743ad545f63422cc8e71a71 (patch) | |
| tree | 5737aa67c96dcd11d3474989889189732e374900 /cmd-delete-buffer.c | |
| parent | f5973b77763e3f8da8e8f6483464f6f4bc2f3981 (diff) | |
| parent | 92af7f5901bd944e385e7fdbe8696b2c911ed776 (diff) | |
| download | rtmux-77f582ff137808cc3743ad545f63422cc8e71a71.tar.gz rtmux-77f582ff137808cc3743ad545f63422cc8e71a71.tar.bz2 rtmux-77f582ff137808cc3743ad545f63422cc8e71a71.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-delete-buffer.c')
| -rw-r--r-- | cmd-delete-buffer.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/cmd-delete-buffer.c b/cmd-delete-buffer.c index e05fe090..9957de66 100644 --- a/cmd-delete-buffer.c +++ b/cmd-delete-buffer.c @@ -41,23 +41,16 @@ enum cmd_retval cmd_delete_buffer_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; - char *cause; - int buffer; + const char *bufname; if (!args_has(args, 'b')) { paste_free_top(); return (CMD_RETURN_NORMAL); } + bufname = args_get(args, 'b'); - buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause); - if (cause != NULL) { - cmdq_error(cmdq, "buffer %s", cause); - free(cause); - return (CMD_RETURN_ERROR); - } - - if (paste_free_index(buffer) != 0) { - cmdq_error(cmdq, "no buffer %d", buffer); + if (paste_free_name(bufname) != 0) { + cmdq_error(cmdq, "no buffer %s", bufname); return (CMD_RETURN_ERROR); } |