diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-09 12:29:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-09 12:29:56 +0100 |
| commit | 1567558b20575e1b17c3808c6bd622b0b4810e36 (patch) | |
| tree | 99daa4315bad8425010182fc21c12516a5c96713 /src/edit.c | |
| parent | 0562532c2eee6205d225aa1dc7e3e89af0dfd990 (diff) | |
patch 8.0.1481: clearing a pointer takes two linesv8.0.1481
Problem: Clearing a pointer takes two lines.
Solution: Add vim_clear() to free and clear the pointer.
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/src/edit.c b/src/edit.c index 6c21eee4e6..863f1cb68d 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2927,8 +2927,7 @@ ins_compl_del_pum(void) if (compl_match_array != NULL) { pum_undisplay(); - vim_free(compl_match_array); - compl_match_array = NULL; + vim_clear((void **)&compl_match_array); } } @@ -3430,10 +3429,8 @@ ins_compl_free(void) compl_T *match; int i; - vim_free(compl_pattern); - compl_pattern = NULL; - vim_free(compl_leader); - compl_leader = NULL; + vim_clear((void **)&compl_pattern); + vim_clear((void **)&compl_leader); if (compl_first_match == NULL) return; @@ -3465,13 +3462,10 @@ ins_compl_clear(void) compl_cont_status = 0; compl_started = FALSE; compl_matches = 0; - vim_free(compl_pattern); - compl_pattern = NULL; - vim_free(compl_leader); - compl_leader = NULL; + vim_clear((void **)&compl_pattern); + vim_clear((void **)&compl_leader); edit_submode_extra = NULL; - vim_free(compl_orig_text); - compl_orig_text = NULL; + vim_clear((void **)&compl_orig_text); compl_enter_selects = FALSE; /* clear v:completed_item */ set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc_lock(VAR_FIXED)); @@ -5574,10 +5568,8 @@ ins_complete(int c, int enable_pum) if (compl_orig_text == NULL || ins_compl_add(compl_orig_text, -1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK) { - vim_free(compl_pattern); - compl_pattern = NULL; - vim_free(compl_orig_text); - compl_orig_text = NULL; + vim_clear((void **)&compl_pattern); + vim_clear((void **)&compl_orig_text); return FAIL; } @@ -7206,11 +7198,9 @@ set_last_insert(int c) void free_last_insert(void) { - vim_free(last_insert); - last_insert = NULL; + vim_clear((void **)&last_insert); # ifdef FEAT_INS_EXPAND - vim_free(compl_orig_text); - compl_orig_text = NULL; + vim_clear((void **)&compl_orig_text); # endif } #endif @@ -7838,8 +7828,7 @@ mb_replace_pop_ins(int cc) static void replace_flush(void) { - vim_free(replace_stack); - replace_stack = NULL; + vim_clear((void **)&replace_stack); replace_stack_len = 0; replace_stack_nr = 0; } |