patch 8.0.1496: clearing a pointer takes two lines
Problem: Clearing a pointer takes two lines.
Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi,
closes #2629)
diff --git a/src/memfile.c b/src/memfile.c
index 0fb2787..0d07b75 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -297,10 +297,8 @@
if (mfp->mf_fname != NULL)
{
mch_remove(mfp->mf_fname); /* delete the swap file */
- vim_free(mfp->mf_fname);
- vim_free(mfp->mf_ffname);
- mfp->mf_fname = NULL;
- mfp->mf_ffname = NULL;
+ VIM_CLEAR(mfp->mf_fname);
+ VIM_CLEAR(mfp->mf_ffname);
}
}
@@ -1288,10 +1286,8 @@
*/
if (mfp->mf_fd < 0)
{
- vim_free(mfp->mf_fname);
- vim_free(mfp->mf_ffname);
- mfp->mf_fname = NULL;
- mfp->mf_ffname = NULL;
+ VIM_CLEAR(mfp->mf_fname);
+ VIM_CLEAR(mfp->mf_ffname);
}
else
{