IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2144 from jszakmeister/fix-warning-in-release

Browse Source 
Fix a couple warnings in the release build.
This commit is contained in:
John Szakmeister 2015-03-20 09:54:06 -04:00
commit 90bce5ad38
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/msgpack_rpc/channel.c
View File

@ -338,12 +338,12 @@ static void job_err(RStream *rstream, void *data, bool eof)
{ {
size_t count; size_t count;
char buf[256]; char buf[256];
Channel *channel = job_data(data);
while ((count = rstream_pending(rstream))) { while ((count = rstream_pending(rstream))) {
size_t read = rstream_read(rstream, buf, sizeof(buf) - 1); size_t read = rstream_read(rstream, buf, sizeof(buf) - 1);
buf[read] = NUL; buf[read] = NUL;
ELOG("Channel %" PRIu64 " stderr: %s", channel->id, buf); ELOG("Channel %" PRIu64 " stderr: %s",
((Channel *)job_data(data))->id, buf);
} }
} }

5
src/nvim/os/wstream.c
View File

@ -116,9 +116,8 @@ void wstream_set_stream(WStream *wstream, uv_stream_t *stream)
/// @param file The file descriptor /// @param file The file descriptor
void wstream_set_file(WStream *wstream, uv_file file) void wstream_set_file(WStream *wstream, uv_file file)
{ {
uv_handle_type type = uv_guess_handle(file); assert(uv_guess_handle(file) == UV_NAMED_PIPE ||
uv_guess_handle(file) == UV_TTY);
assert(type == UV_NAMED_PIPE || type == UV_TTY);
wstream->stream = xmalloc(sizeof(uv_pipe_t)); wstream->stream = xmalloc(sizeof(uv_pipe_t));
uv_pipe_init(uv_default_loop(), (uv_pipe_t *)wstream->stream, 0); uv_pipe_init(uv_default_loop(), (uv_pipe_t *)wstream->stream, 0);
uv_pipe_open((uv_pipe_t *)wstream->stream, file); uv_pipe_open((uv_pipe_t *)wstream->stream, file);