Mercurial > vim
changeset 7795:4f23088b47ea v7.4.1194
commit https://github.com/vim/vim/commit/83162468b3c8722fffea033d3de144cd4191472a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 28 23:10:07 2016 +0100
patch 7.4.1194
Problem: Compiler warning for not using return value of fwrite().
Solution: Return OK/FAIL. (Charles Campbell)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Jan 2016 23:15:04 +0100 |
| parents | 4815b3e3c3c1 |
| children | acda999cbbb3 |
| files | src/channel.c src/proto/channel.pro src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -560,8 +560,9 @@ channel_close(int idx) /* * Store "buf[len]" on channel "idx". + * Returns OK or FAIL. */ - void + int channel_save(int idx, char_u *buf, int len) { queue_T *node; @@ -569,12 +570,12 @@ channel_save(int idx, char_u *buf, int l node = (queue_T *)alloc(sizeof(queue_T)); if (node == NULL) - return; /* out of memory */ + return FAIL; /* out of memory */ node->buffer = alloc(len + 1); if (node->buffer == NULL) { vim_free(node); - return; /* out of memory */ + return FAIL; /* out of memory */ } mch_memmove(node->buffer, buf, (size_t)len); node->buffer[len] = NUL; @@ -594,9 +595,11 @@ channel_save(int idx, char_u *buf, int l if (debugfd != NULL) { fprintf(debugfd, "RECV on %d: ", idx); - fwrite(buf, len, 1, debugfd); + if (fwrite(buf, len, 1, debugfd) != 1) + return FAIL; fprintf(debugfd, "\n"); } + return OK; } /*
--- a/src/proto/channel.pro +++ b/src/proto/channel.pro @@ -8,7 +8,7 @@ void channel_will_block(int idx); int channel_decode_json(char_u *msg, typval_T *tv); int channel_is_open(int idx); void channel_close(int idx); -void channel_save(int idx, char_u *buf, int len); +int channel_save(int idx, char_u *buf, int len); char_u *channel_peek(int idx); char_u *channel_get(int idx); int channel_collapse(int idx);