diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2014-04-29 16:16:51 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-05 18:38:52 -0400 |
commit | f9d4c78ddcd99efeeb4e4e44b7bd0b6e34889db3 (patch) | |
tree | ba74eb6c3bdb2d172e58f16c0bffff200ecb25c5 /src/edit.c | |
parent | c5cac800e7b63d175f7da9462804d7f250f1e23a (diff) | |
download | rneovim-f9d4c78ddcd99efeeb4e4e44b7bd0b6e34889db3.tar.gz rneovim-f9d4c78ddcd99efeeb4e4e44b7bd0b6e34889db3.tar.bz2 rneovim-f9d4c78ddcd99efeeb4e4e44b7bd0b6e34889db3.zip |
replaced `vim_free()` calls with `free()` calls
Diffstat (limited to 'src/edit.c')
-rw-r--r-- | src/edit.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/edit.c b/src/edit.c index d02dd6fbbc..4b1d1878d1 100644 --- a/src/edit.c +++ b/src/edit.c @@ -569,7 +569,7 @@ edit ( new_insert_skip = 0; else { new_insert_skip = (int)STRLEN(ptr); - vim_free(ptr); + free(ptr); } old_indent = 0; @@ -734,7 +734,7 @@ edit ( if (str != NULL) { for (p = str; *p != NUL; mb_ptr_adv(p)) ins_compl_addleader(PTR2CHAR(p)); - vim_free(str); + free(str); } else ins_compl_addleader(c); continue; @@ -1239,7 +1239,7 @@ normalchar: } AppendToRedobuffLit(str, -1); } - vim_free(str); + free(str); c = NUL; } @@ -1656,7 +1656,7 @@ change_indent ( memset(ptr, ' ', i); new_cursor_col += i; ins_str(ptr); - vim_free(ptr); + free(ptr); } /* @@ -1742,7 +1742,7 @@ change_indent ( /* Insert new stuff into line again */ ins_bytes(new_line); - vim_free(new_line); + free(new_line); } } @@ -2067,7 +2067,7 @@ int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int *(p++) = wca[i++]; *p = NUL; - vim_free(wca); + free(wca); return ins_compl_add(IObuff, len, icase, fname, NULL, dir, flags, FALSE); @@ -2128,7 +2128,7 @@ ins_compl_add ( if (flags & ORIGINAL_TEXT) match->cp_number = 0; if ((match->cp_str = vim_strnsave(str, len)) == NULL) { - vim_free(match); + free(match); return FAIL; } match->cp_icase = icase; @@ -2373,7 +2373,7 @@ static void ins_compl_del_pum(void) { if (compl_match_array != NULL) { pum_undisplay(); - vim_free(compl_match_array); + free(compl_match_array); compl_match_array = NULL; } } @@ -2594,8 +2594,8 @@ ins_compl_dictionaries ( ptr = xmalloc(len); vim_snprintf((char *)ptr, len, "^\\s*\\zs\\V%s", pat_esc); regmatch.regprog = vim_regcomp(ptr, RE_MAGIC); - vim_free(pat_esc); - vim_free(ptr); + free(pat_esc); + free(ptr); } else { regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0); if (regmatch.regprog == NULL) @@ -2643,7 +2643,7 @@ ins_compl_dictionaries ( theend: p_scs = save_p_scs; vim_regfree(regmatch.regprog); - vim_free(buf); + free(buf); } static void ins_compl_files(int count, char_u **files, int thesaurus, int flags, regmatch_T *regmatch, char_u *buf, int *dir) @@ -2792,9 +2792,9 @@ static void ins_compl_free(void) compl_T *match; int i; - vim_free(compl_pattern); + free(compl_pattern); compl_pattern = NULL; - vim_free(compl_leader); + free(compl_leader); compl_leader = NULL; if (compl_first_match == NULL) @@ -2807,13 +2807,13 @@ static void ins_compl_free(void) do { match = compl_curr_match; compl_curr_match = compl_curr_match->cp_next; - vim_free(match->cp_str); + free(match->cp_str); /* several entries may use the same fname, free it just once. */ if (match->cp_flags & FREE_FNAME) - vim_free(match->cp_fname); + free(match->cp_fname); for (i = 0; i < CPT_COUNT; ++i) - vim_free(match->cp_text[i]); - vim_free(match); + free(match->cp_text[i]); + free(match); } while (compl_curr_match != NULL && compl_curr_match != compl_first_match); compl_first_match = compl_curr_match = NULL; compl_shown_match = NULL; @@ -2824,12 +2824,12 @@ static void ins_compl_clear(void) compl_cont_status = 0; compl_started = FALSE; compl_matches = 0; - vim_free(compl_pattern); + free(compl_pattern); compl_pattern = NULL; - vim_free(compl_leader); + free(compl_leader); compl_leader = NULL; edit_submode_extra = NULL; - vim_free(compl_orig_text); + free(compl_orig_text); compl_orig_text = NULL; compl_enter_selects = FALSE; } @@ -2870,7 +2870,7 @@ static int ins_compl_bs(void) || ins_compl_need_restart()) ins_compl_restart(); - vim_free(compl_leader); + free(compl_leader); compl_leader = vim_strnsave(line + compl_col, (int)(p - line) - compl_col); if (compl_leader != NULL) { ins_compl_new_leader(); @@ -2976,7 +2976,7 @@ static void ins_compl_addleader(int c) * cursor doesn't point original position, changing compl_leader would * break redo. */ if (!compl_opt_refresh_always) { - vim_free(compl_leader); + free(compl_leader); compl_leader = vim_strnsave(ml_get_curline() + compl_col, (int)(curwin->w_cursor.col - compl_col)); if (compl_leader != NULL) @@ -3008,7 +3008,7 @@ static void ins_compl_set_original_text(char_u *str) if (compl_first_match->cp_flags & ORIGINAL_TEXT) { /* safety check */ p = vim_strsave(str); if (p != NULL) { - vim_free(compl_first_match->cp_str); + free(compl_first_match->cp_str); compl_first_match->cp_str = p; } } @@ -4565,13 +4565,13 @@ static int ins_complete(int c) ins_compl_fixRedoBufForLeader(NULL); /* Always add completion for the original text. */ - vim_free(compl_orig_text); + free(compl_orig_text); compl_orig_text = vim_strnsave(line + compl_col, compl_length); 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); + free(compl_pattern); compl_pattern = NULL; - vim_free(compl_orig_text); + free(compl_orig_text); compl_orig_text = NULL; return FAIL; } @@ -5441,7 +5441,7 @@ internal_format ( * moved, now we re-insert it into the new line. */ ins_bytes(saved_text); - vim_free(saved_text); + free(saved_text); } else { /* * Check if cursor is not past the NUL off the line, cindent @@ -5768,11 +5768,11 @@ stop_insert ( ptr = get_inserted(); if (did_restart_edit == 0 || (ptr != NULL && (int)STRLEN(ptr) > new_insert_skip)) { - vim_free(last_insert); + free(last_insert); last_insert = ptr; last_insert_skip = new_insert_skip; } else - vim_free(ptr); + free(ptr); if (!arrow_used && end_insert_pos != NULL) { /* Auto-format now. It may seem strange to do this when stopping an @@ -5871,7 +5871,7 @@ void set_last_insert(int c) { char_u *s; - vim_free(last_insert); + free(last_insert); last_insert = xmalloc(MB_MAXBYTES * 3 + 5); s = last_insert; /* Use the CTRL-V only when entering a special char */ @@ -5886,9 +5886,9 @@ void set_last_insert(int c) #if defined(EXITFREE) || defined(PROTO) void free_last_insert(void) { - vim_free(last_insert); + free(last_insert); last_insert = NULL; - vim_free(compl_orig_text); + free(compl_orig_text); compl_orig_text = NULL; } @@ -6289,7 +6289,7 @@ replace_push ( if (replace_stack != NULL) { memmove(p, replace_stack, (size_t)(replace_stack_nr * sizeof(char_u))); - vim_free(replace_stack); + free(replace_stack); } replace_stack = p; } @@ -6415,7 +6415,7 @@ static void mb_replace_pop_ins(int cc) */ static void replace_flush(void) { - vim_free(replace_stack); + free(replace_stack); replace_stack = NULL; replace_stack_len = 0; replace_stack_nr = 0; @@ -8103,7 +8103,7 @@ static int ins_tab(void) } if (State & VREPLACE_FLAG) - vim_free(saved_line); + free(saved_line); curwin->w_p_list = save_list; } |