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/buffer.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/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 8a3d4ad418..a5ad1f1a11 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -809,8 +809,7 @@ free_buffer_stuff( bufhl_clear_all(buf); // delete any highligts map_clear_int(buf, MAP_ALL_MODES, true, false); // clear local mappings map_clear_int(buf, MAP_ALL_MODES, true, true); // clear local abbrevs - xfree(buf->b_start_fenc); - buf->b_start_fenc = NULL; + XFREE_CLEAR(buf->b_start_fenc); buf_updates_unregister_all(buf); } @@ -1756,10 +1755,8 @@ buf_T * buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags) buf->b_wininfo = xcalloc(1, sizeof(wininfo_T)); if (ffname != NULL && (buf->b_ffname == NULL || buf->b_sfname == NULL)) { - xfree(buf->b_ffname); - buf->b_ffname = NULL; - xfree(buf->b_sfname); - buf->b_sfname = NULL; + XFREE_CLEAR(buf->b_ffname); + XFREE_CLEAR(buf->b_sfname); if (buf != curbuf) { free_buffer(buf); } @@ -2665,10 +2662,8 @@ setfname( if (ffname == NULL || *ffname == NUL) { // Removing the name. - xfree(buf->b_ffname); - xfree(buf->b_sfname); - buf->b_ffname = NULL; - buf->b_sfname = NULL; + XFREE_CLEAR(buf->b_ffname); + XFREE_CLEAR(buf->b_sfname); } else { fname_expand(buf, &ffname, &sfname); // will allocate ffname if (ffname == NULL) { // out of memory @@ -3791,8 +3786,7 @@ int build_stl_str_hl( if (str != NULL && *str != 0) { if (*skipdigits(str) == NUL) { num = atoi((char *)str); - xfree(str); - str = NULL; + XFREE_CLEAR(str); itemisflag = false; } } |