aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2018-03-24 09:49:31 +0100
committerBjörn Linse <bjorn.linse@gmail.com>2018-04-12 22:33:05 +0200
commit0865adbbc282d034849b28d70667e4415d8df829 (patch)
tree2e569135edc74353b1029218435aaf53b788f4ab
parentaea079a25df1df5c94e97adf3c92ead397168e27 (diff)
downloadrneovim-0865adbbc282d034849b28d70667e4415d8df829.tar.gz
rneovim-0865adbbc282d034849b28d70667e4415d8df829.tar.bz2
rneovim-0865adbbc282d034849b28d70667e4415d8df829.zip
channels: cleanup channel freeing code
-rw-r--r--src/nvim/channel.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/nvim/channel.c b/src/nvim/channel.c
index f31ba424f5..776e2bfa86 100644
--- a/src/nvim/channel.c
+++ b/src/nvim/channel.c
@@ -237,16 +237,16 @@ void channel_create_event(Channel *chan, const char *ext_source)
#endif
}
-void channel_incref(Channel *channel)
+void channel_incref(Channel *chan)
{
- channel->refcount++;
+ chan->refcount++;
}
-void channel_decref(Channel *channel)
+void channel_decref(Channel *chan)
{
- if (!(--channel->refcount)) {
+ if (!(--chan->refcount)) {
// delay free, so that libuv is done with the handles
- multiqueue_put(main_loop.events, free_channel_event, 1, channel);
+ multiqueue_put(main_loop.events, free_channel_event, 1, chan);
}
}
@@ -268,18 +268,18 @@ void callback_reader_start(CallbackReader *reader)
static void free_channel_event(void **argv)
{
- Channel *channel = argv[0];
- if (channel->is_rpc) {
- rpc_free(channel);
+ Channel *chan = argv[0];
+ if (chan->is_rpc) {
+ rpc_free(chan);
}
- callback_reader_free(&channel->on_stdout);
- callback_reader_free(&channel->on_stderr);
- callback_free(&channel->on_exit);
+ callback_reader_free(&chan->on_stdout);
+ callback_reader_free(&chan->on_stderr);
+ callback_free(&chan->on_exit);
- pmap_del(uint64_t)(channels, channel->id);
- multiqueue_free(channel->events);
- xfree(channel);
+ pmap_del(uint64_t)(channels, chan->id);
+ multiqueue_free(chan->events);
+ xfree(chan);
}
static void channel_destroy_early(Channel *chan)