diff options
author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-06-17 10:01:44 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-06-18 11:36:04 -0300 |
commit | ac5fb407e43814477102cea1885adc225742571c (patch) | |
tree | dba1c8635a5397f11fcc84734b3dbf8a59d7b827 /src/nvim/os/channel.c | |
parent | 0c764fb1a48ad7ad51766ee480e0cd0d3a43566b (diff) | |
download | rneovim-ac5fb407e43814477102cea1885adc225742571c.tar.gz rneovim-ac5fb407e43814477102cea1885adc225742571c.tar.bz2 rneovim-ac5fb407e43814477102cea1885adc225742571c.zip |
wstream: Refactor wstream_new_buffer/wstream_write
- Removed 'copy' parameter from `wstream_new_buffer`. Callers simply pass a
copy of the buffer if required.
- Added a callback parameter, which is used to notify callers when the data is
successfully written. The callback is also used to free the buffer(if
required) and is compatible with `free` from the standard library.
Diffstat (limited to 'src/nvim/os/channel.c')
-rw-r--r-- | src/nvim/os/channel.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/nvim/os/channel.c b/src/nvim/os/channel.c index b1e2a8a287..878aeac0a8 100644 --- a/src/nvim/os/channel.c +++ b/src/nvim/os/channel.c @@ -194,9 +194,10 @@ static void parse_msgpack(RStream *rstream, void *data, bool eof) // Perform the call msgpack_rpc_call(channel->id, &unpacked.data, &response); wstream_write(channel->data.streams.write, - wstream_new_buffer(channel->sbuffer->data, + wstream_new_buffer(xmemdup(channel->sbuffer->data, + channel->sbuffer->size), channel->sbuffer->size, - true)); + free)); // Clear the buffer for future calls msgpack_sbuffer_clear(channel->sbuffer); @@ -218,9 +219,10 @@ static void parse_msgpack(RStream *rstream, void *data, bool eof) "an object with high level of nesting", &response); wstream_write(channel->data.streams.write, - wstream_new_buffer(channel->sbuffer->data, + wstream_new_buffer(xmemdup(channel->sbuffer->data, + channel->sbuffer->size), channel->sbuffer->size, - true)); + free)); // Clear the buffer for future calls msgpack_sbuffer_clear(channel->sbuffer); } @@ -310,9 +312,10 @@ static WBuffer *serialize_event(char *type, typval_T *data) msgpack_packer packer; msgpack_packer_init(&packer, &msgpack_event_buffer, msgpack_sbuffer_write); msgpack_rpc_notification(event_type, event_data, &packer); - WBuffer *rv = wstream_new_buffer(msgpack_event_buffer.data, + WBuffer *rv = wstream_new_buffer(xmemdup(msgpack_event_buffer.data, + msgpack_event_buffer.size), msgpack_event_buffer.size, - true); + free); msgpack_rpc_free_object(event_data); msgpack_sbuffer_clear(&msgpack_event_buffer); |