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
This commit is contained in:
Justin M. Keyes
2019-05-22 01:02:26 +02:00
parent a9d7ec4587
commit ae846b41df
36 changed files with 164 additions and 305 deletions

View File

@@ -563,8 +563,7 @@ void ml_close(buf_T *buf, int del_file)
if (buf->b_ml.ml_line_lnum != 0 && (buf->b_ml.ml_flags & ML_LINE_DIRTY))
xfree(buf->b_ml.ml_line_ptr);
xfree(buf->b_ml.ml_stack);
xfree(buf->b_ml.ml_chunksize);
buf->b_ml.ml_chunksize = NULL;
XFREE_CLEAR(buf->b_ml.ml_chunksize);
buf->b_ml.ml_mfp = NULL;
/* Reset the "recovered" flag, give the ATTENTION prompt the next time
@@ -3344,8 +3343,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
if (fname == NULL) /* must be out of memory */
break;
if ((n = strlen(fname)) == 0) { /* safety check */
xfree(fname);
fname = NULL;
XFREE_CLEAR(fname);
break;
}
// check if the swapfile already exists
@@ -3541,8 +3539,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
if (fname[n - 1] == 'a') { /* ".s?a" */
if (fname[n - 2] == 'a') { /* ".saa": tried enough, give up */
EMSG(_("E326: Too many swap files found"));
xfree(fname);
fname = NULL;
XFREE_CLEAR(fname);
break;
}
--fname[n - 2]; /* ".svz", ".suz", etc. */