diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-25 14:49:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-25 14:49:43 +0200 |
| commit | 2f023f40b275a904c96d5b287e9e9abe6df1aec7 (patch) | |
| tree | 36f2b5bec81f7144c5bd3787f33959bd60c59e0e /src/nvim/mbyte.c | |
| parent | 4769deb36a54c3b2a4a2d2addb2937c1aa7dd629 (diff) | |
| parent | eddd1bff3e7bf8df7405f6b0bfd01a5bb8ba20a9 (diff) | |
| download | rneovim-2f023f40b275a904c96d5b287e9e9abe6df1aec7.tar.gz rneovim-2f023f40b275a904c96d5b287e9e9abe6df1aec7.tar.bz2 rneovim-2f023f40b275a904c96d5b287e9e9abe6df1aec7.zip | |
Merge #10046 from justinmk/xfree
refactor: introduce XFREE_CLEAR()
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. */ |