aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ops.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-05-22 01:02:26 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-05-25 10:07:05 +0200
commitae846b41dfed16446be6469cb01f12f1eb1fa534 (patch)
tree2851845f2faf61d5945cb4f1d8761316201a6246 /src/nvim/ops.c
parenta9d7ec4587d8eb20f12ebecc427ad818fb0e4971 (diff)
downloadrneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.tar.gz
rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.tar.bz2
rneovim-ae846b41dfed16446be6469cb01f12f1eb1fa534.zip
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
Diffstat (limited to 'src/nvim/ops.c')
-rw-r--r--src/nvim/ops.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 216bab4dda..1c5d4e98a7 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -983,9 +983,8 @@ do_execreg(
EMSG(_(e_nolastcmd));
return FAIL;
}
- xfree(new_last_cmdline); /* don't keep the cmdline containing @: */
- new_last_cmdline = NULL;
- /* Escape all control characters with a CTRL-V */
+ XFREE_CLEAR(new_last_cmdline); // don't keep the cmdline containing @:
+ // Escape all control characters with a CTRL-V
p = vim_strsave_escaped_ext(
last_cmdline,
(char_u *)
@@ -2348,8 +2347,7 @@ void free_register(yankreg_T *reg)
for (size_t i = reg->y_size; i-- > 0;) { // from y_size - 1 to 0 included
xfree(reg->y_array[i]);
}
- xfree(reg->y_array);
- reg->y_array = NULL;
+ XFREE_CLEAR(reg->y_array);
}
}