diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-24 12:59:00 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-24 12:59:00 +0100 |
| commit | 3f54c9292fc8ee147d45256e430fbf85fab98128 (patch) | |
| tree | afe1e1fe8ca82a88e7e6bbd94fb877f58c2e69c4 /cmd-load-buffer.c | |
| parent | 953c3ef47a1933d38308075c1bacc7ea8d38301b (diff) | |
| parent | bec6c807cd580b003cd94b52a20caa2cbc7a0753 (diff) | |
| download | rtmux-3f54c9292fc8ee147d45256e430fbf85fab98128.tar.gz rtmux-3f54c9292fc8ee147d45256e430fbf85fab98128.tar.bz2 rtmux-3f54c9292fc8ee147d45256e430fbf85fab98128.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-load-buffer.c')
| -rw-r--r-- | cmd-load-buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index 2cb01b97..16ff40d0 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -119,10 +119,10 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq) limit = options_get_number(&global_options, "buffer-limit"); if (buffer == -1) { - paste_add(&global_buffers, pdata, psize, limit); + paste_add(pdata, psize, limit); return (CMD_RETURN_NORMAL); } - if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) { + if (paste_replace(buffer, pdata, psize) != 0) { cmdq_error(cmdq, "no buffer %d", buffer); free(pdata); return (CMD_RETURN_ERROR); @@ -164,8 +164,8 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data) limit = options_get_number(&global_options, "buffer-limit"); if (*buffer == -1) - paste_add(&global_buffers, pdata, psize, limit); - else if (paste_replace(&global_buffers, *buffer, pdata, psize) != 0) { + paste_add(pdata, psize, limit); + else if (paste_replace(*buffer, pdata, psize) != 0) { /* No context so can't use server_client_msg_error. */ evbuffer_add_printf(c->stderr_data, "no buffer %d\n", *buffer); server_push_stderr(c); |