diff options
| -rw-r--r-- | src/nvim/indent_c.c | 5 | ||||
| -rw-r--r-- | src/nvim/mbyte.c | 6 | ||||
| -rw-r--r-- | src/nvim/os/fs.c | 1 | ||||
| -rw-r--r-- | test/functional/core/job_spec.lua | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 6f03cf6037..7b758b4dac 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -173,9 +173,8 @@ static char_u *skip_string(char_u *p) char_u *delim = p + 2; char_u *paren = vim_strchr(delim, '('); - if (paren != NULL) - { - long delim_len = paren - delim; + if (paren != NULL) { + ptrdiff_t delim_len = paren - delim; for (p += 3; *p; ++p) if (p[0] == ')' && STRNCMP(p + 1, delim, delim_len) == 0 diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index ec4969d4f6..c855d68605 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -1484,6 +1484,9 @@ int utf8_to_utf16(const char *str, WCHAR **strw) (WCHAR *)pos, wchar_len); assert(r == wchar_len); + if (r != wchar_len) { + EMSG2("MultiByteToWideChar failed: %d", r); + } *strw = (WCHAR *)pos; return 0; @@ -1519,6 +1522,9 @@ int utf16_to_utf8(const WCHAR *strw, char **str) NULL, NULL); assert(r == utf8_len); + if (r != utf8_len) { + EMSG2("WideCharToMultiByte failed: %d", r); + } *str = pos; return 0; diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 4aa727733e..30e08ac129 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -939,7 +939,6 @@ char_u * os_resolve_shortcut(char_u *fname) OLECHAR wsz[MAX_PATH]; char_u *rfname = NULL; int len; - int conversion_result; IShellLinkW *pslw = NULL; WIN32_FIND_DATAW ffdw; diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index 653f76f372..9ecfcd3df9 100644 --- a/test/functional/core/job_spec.lua +++ b/test/functional/core/job_spec.lua @@ -341,7 +341,7 @@ describe('jobs', function() function! s:OnEvent(id, data, event) dict let g:job_result = get(self, 'user') endfunction - let s:job = jobstart('echo', { + let s:job = jobstart('echo "foo"', { \ 'on_stdout': 's:OnEvent', \ 'on_stderr': 's:OnEvent', \ 'on_exit': 's:OnEvent', |