diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-22 01:02:26 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-05-25 10:07:05 +0200 |
| commit | ae846b41dfed16446be6469cb01f12f1eb1fa534 (patch) | |
| tree | 2851845f2faf61d5945cb4f1d8761316201a6246 /src/nvim/mbyte.c | |
| parent | a9d7ec4587d8eb20f12ebecc427ad818fb0e4971 (diff) | |
| download | rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.tar.gz rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.tar.bz2 rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.zip | |
vim-patch:8.0.1496: VIM_CLEAR()
Problem: Clearing a pointer takes two lines.
Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi,
closes #2629)
vim-patch:8.0.1481
Diffstat (limited to 'src/nvim/mbyte.c')
| -rw-r--r-- | src/nvim/mbyte.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 8cc91146cc..c161bad66f 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -1421,8 +1421,7 @@ int utf16_to_utf8(const wchar_t *strw, char **str) NULL, NULL); if (utf8_len == 0) { - xfree(*str); - *str = NULL; + XFREE_CLEAR(*str); return GetLastError(); } (*str)[utf8_len] = '\0'; @@ -2119,9 +2118,8 @@ static char_u *iconv_string(const vimconv_T *const vcp, char_u *str, from += l; fromlen -= l; } else if (ICONV_ERRNO != ICONV_E2BIG) { - /* conversion failed */ - xfree(result); - result = NULL; + // conversion failed + XFREE_CLEAR(result); break; } /* Not enough room or skipping illegal sequence. */ |