From ae846b41dfed16446be6469cb01f12f1eb1fa534 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 22 May 2019 01:02:26 +0200
Subject: 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
---
 src/nvim/mbyte.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/nvim/mbyte.c')

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. */
-- 
cgit