summaryrefslogtreecommitdiff
path: root/src/proto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-20 19:56:13 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-20 19:56:13 +0100
commit6f3a544228c1faf92211cbaf8bbedb1dff883f90 (patch)
tree92dd5414be493707e137ccf6a5d59e1d5cef13ad /src/proto
parentfffd5560c6c8840be3233ef1c8da3c9e5dd424ea (diff)
downloadvim-git-6f3a544228c1faf92211cbaf8bbedb1dff883f90.tar.gz
patch 7.4.1372v7.4.1372
Problem: channel read implementation is incomplete. Solution: Add ch_read() and options for ch_readraw().
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/channel.pro7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/proto/channel.pro b/src/proto/channel.pro
index 610a135eb..fa06f4f29 100644
--- a/src/proto/channel.pro
+++ b/src/proto/channel.pro
@@ -23,9 +23,9 @@ void channel_clear(channel_T *channel);
void channel_free_all(void);
int channel_get_id(void);
void channel_read(channel_T *channel, int part, char *func);
-char_u *channel_read_block(channel_T *channel, int part);
-int channel_read_json_block(channel_T *channel, int part, int id, typval_T **rettv);
-channel_T *channel_fd2channel(sock_T fd, int *part);
+char_u *channel_read_block(channel_T *channel, int part, int timeout);
+int channel_read_json_block(channel_T *channel, int part, int timeout, int id, typval_T **rettv);
+channel_T *channel_fd2channel(sock_T fd, int *partp);
void channel_handle_events(void);
int channel_send(channel_T *channel, int part, char_u *buf, char *fun);
int channel_poll_setup(int nfd_in, void *fds_in);
@@ -37,4 +37,5 @@ int set_ref_in_channel(int copyID);
int channel_part_send(channel_T *channel);
int channel_part_read(channel_T *channel);
ch_mode_T channel_get_mode(channel_T *channel, int part);
+int channel_get_timeout(channel_T *channel, int part);
/* vim: set ft=c : */