diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-19 13:49:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-19 13:49:43 +0100 |
| commit | a889cf4642a89537e3eeecf6d30326bf6aa4776f (patch) | |
| tree | c01231c1c6652784d299da63d177ee1e5030bd9c | |
| parent | 0899d698030ec076eb26352cda1ea334ab0819d9 (diff) | |
| download | vim-git-a889cf4642a89537e3eeecf6d30326bf6aa4776f.tar.gz | |
patch 7.4.1593v7.4.1593
Problem: Using channel timeout instead of request timeout. (Coverity)
Solution: Remove the extra assignment.
| -rw-r--r-- | src/channel.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c index 1f7ad6174..2a71077fd 100644 --- a/src/channel.c +++ b/src/channel.c @@ -2684,7 +2684,6 @@ ch_expr_common(typval_T *argvars, typval_T *rettv, int eval) timeout = opt.jo_timeout; else timeout = channel_get_timeout(channel, part_read); - timeout = channel_get_timeout(channel, part_read); if (channel_read_json_block(channel, part_read, timeout, id, &listtv) == OK) { diff --git a/src/version.c b/src/version.c index 409a9f40b..449c8f24e 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1593, +/**/ 1592, /**/ 1591, |