diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-10 18:45:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-10 18:45:26 +0100 |
| commit | d23a823669d93fb2a570a039173eefe4856ac806 (patch) | |
| tree | 617130258eae70e3bd7ef7b6da9c494ffee7b572 /src/buffer.c | |
| parent | 42443c7d7fecc3a2a72154bb6139b028438617c2 (diff) | |
patch 8.0.1496: clearing a pointer takes two linesv8.0.1496
Problem: Clearing a pointer takes two lines.
Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi,
closes #2629)
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/buffer.c b/src/buffer.c index c0d3d3d9fc..c3e0c50801 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -944,8 +944,7 @@ free_buffer_stuff( map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ #endif #ifdef FEAT_MBYTE - vim_free(buf->b_start_fenc); - buf->b_start_fenc = NULL; + VIM_CLEAR(buf->b_start_fenc); #endif } @@ -2037,10 +2036,8 @@ buflist_new( if ((ffname != NULL && (buf->b_ffname == NULL || buf->b_sfname == NULL)) || buf->b_wininfo == NULL) { - vim_free(buf->b_ffname); - buf->b_ffname = NULL; - vim_free(buf->b_sfname); - buf->b_sfname = NULL; + VIM_CLEAR(buf->b_ffname); + VIM_CLEAR(buf->b_sfname); if (buf != curbuf) free_buffer(buf); return NULL; @@ -3136,10 +3133,8 @@ setfname( if (ffname == NULL || *ffname == NUL) { /* Removing the name. */ - vim_free(buf->b_ffname); - vim_free(buf->b_sfname); - buf->b_ffname = NULL; - buf->b_sfname = NULL; + VIM_CLEAR(buf->b_ffname); + VIM_CLEAR(buf->b_sfname); #ifdef UNIX st.st_dev = (dev_T)-1; #endif @@ -4261,8 +4256,7 @@ build_stl_str_hl( if (*skipdigits(str) == NUL) { num = atoi((char *)str); - vim_free(str); - str = NULL; + VIM_CLEAR(str); itemisflag = FALSE; } } |