aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 7.4.1194

Browse Source 
Problem:    Compiler warning for not using return value of fwrite().
Solution:   Return OK/FAIL. (Charles Campbell)
This commit is contained in:
Bram Moolenaar
2016-01-28 23:10:07 +01:00
parent b8b6511fc1
commit 83162468b3
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/channel.c
View File

@@ -560,8 +560,9 @@ channel_close(int idx)
/* /*
* Store "buf[len]" on channel "idx". * Store "buf[len]" on channel "idx".
* Returns OK or FAIL.
*/ */
void int
channel_save(int idx, char_u *buf, int len) channel_save(int idx, char_u *buf, int len)
{ {
queue_T *node; queue_T *node;
@@ -569,12 +570,12 @@ channel_save(int idx, char_u *buf, int len)
node = (queue_T *)alloc(sizeof(queue_T)); node = (queue_T *)alloc(sizeof(queue_T));
if (node == NULL) if (node == NULL)
return; /* out of memory */ return FAIL; /* out of memory */
node->buffer = alloc(len + 1); node->buffer = alloc(len + 1);
if (node->buffer == NULL) if (node->buffer == NULL)
{ {
vim_free(node); vim_free(node);
return; /* out of memory */ return FAIL; /* out of memory */
} }
mch_memmove(node->buffer, buf, (size_t)len); mch_memmove(node->buffer, buf, (size_t)len);
node->buffer[len] = NUL; node->buffer[len] = NUL;
@@ -594,9 +595,11 @@ channel_save(int idx, char_u *buf, int len)
if (debugfd != NULL) if (debugfd != NULL)
{ {
fprintf(debugfd, "RECV on %d: ", idx); fprintf(debugfd, "RECV on %d: ", idx);
fwrite(buf, len, 1, debugfd); if (fwrite(buf, len, 1, debugfd) != 1)
return FAIL;
fprintf(debugfd, "\n"); fprintf(debugfd, "\n");
} }
return OK;
} }
/* /*

2
src/proto/channel.pro
View File

@@ -8,7 +8,7 @@ void channel_will_block(int idx);
int channel_decode_json(char_u *msg, typval_T *tv); int channel_decode_json(char_u *msg, typval_T *tv);
int channel_is_open(int idx); int channel_is_open(int idx);
void channel_close(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_peek(int idx);
char_u *channel_get(int idx); char_u *channel_get(int idx);
int channel_collapse(int idx); int channel_collapse(int idx);

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1194,
/**/ /**/
1193, 1193,
/**/ /**/