From f9d4c78ddcd99efeeb4e4e44b7bd0b6e34889db3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 29 Apr 2014 16:16:51 +0200 Subject: replaced `vim_free()` calls with `free()` calls --- src/buffer.c | 80 +++++++-------- src/diff.c | 40 ++++---- src/digraph.c | 16 +-- src/edit.c | 70 ++++++------- src/eval.c | 298 +++++++++++++++++++++++++++--------------------------- src/ex_cmds.c | 136 ++++++++++++------------- src/ex_cmds2.c | 74 +++++++------- src/ex_docmd.c | 134 ++++++++++++------------ src/ex_eval.c | 26 ++--- src/ex_getln.c | 106 +++++++++---------- src/file_search.c | 54 +++++----- src/fileio.c | 144 +++++++++++++------------- src/fold.c | 4 +- src/garray.c | 6 +- src/getchar.c | 66 ++++++------ src/hardcopy.c | 20 ++-- src/hashtab.c | 6 +- src/if_cscope.c | 98 +++++++++--------- src/indent.c | 2 +- src/indent_c.c | 4 +- src/main.c | 10 +- src/mark.c | 40 ++++---- src/mbyte.c | 20 ++-- src/memfile.c | 48 ++++----- src/memline.c | 72 ++++++------- src/memory.c | 6 +- src/menu.c | 64 ++++++------ src/message.c | 36 +++---- src/misc1.c | 44 ++++---- src/misc2.c | 8 +- src/normal.c | 18 ++-- src/ops.c | 78 +++++++------- src/option.c | 52 +++++----- src/os/fs.c | 4 +- src/os_unix.c | 24 ++--- src/path.c | 56 +++++----- src/popupmnu.c | 6 +- src/quickfix.c | 86 ++++++++-------- src/regexp.c | 28 ++--- src/regexp_nfa.c | 20 ++-- src/screen.c | 52 +++++----- src/search.c | 54 +++++----- src/spell.c | 170 +++++++++++++++---------------- src/strings.c | 2 +- src/syntax.c | 166 +++++++++++++++--------------- src/tag.c | 60 +++++------ src/term.c | 16 +-- src/ui.c | 8 +- src/undo.c | 42 ++++---- src/window.c | 34 +++---- 50 files changed, 1358 insertions(+), 1350 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 35d5582340..4e87305c60 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -430,8 +430,8 @@ aucmd_abort: * Remove the buffer from the list. */ if (wipe_buf) { - vim_free(buf->b_ffname); - vim_free(buf->b_sfname); + free(buf->b_ffname); + free(buf->b_sfname); if (buf->b_prev == NULL) firstbuf = buf->b_next; else @@ -552,7 +552,7 @@ static void free_buffer(buf_T *buf) buf->b_next = au_pending_free_buf; au_pending_free_buf = buf; } else { - vim_free(buf); + free(buf); } } @@ -576,7 +576,7 @@ free_buffer_stuff ( buf_delete_signs(buf); /* delete any signs */ map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */ map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ - vim_free(buf->b_start_fenc); + free(buf->b_start_fenc); buf->b_start_fenc = NULL; } @@ -594,7 +594,7 @@ static void clear_wininfo(buf_T *buf) clear_winopt(&wip->wi_opt); deleteFoldRecurse(&wip->wi_folds); } - vim_free(wip); + free(wip); } } @@ -1327,7 +1327,7 @@ buflist_new ( buflist_findname(ffname) #endif ) != NULL) { - vim_free(ffname); + free(ffname); if (lnum != 0) buflist_setfpos(buf, curwin, lnum, (colnr_T)0, FALSE); /* copy the options now, if 'cpo' doesn't have 's' and not done @@ -1390,9 +1390,9 @@ buflist_new ( buf->b_wininfo = xcalloc(1, sizeof(wininfo_T)); if (ffname != NULL && (buf->b_ffname == NULL || buf->b_sfname == NULL)) { - vim_free(buf->b_ffname); + free(buf->b_ffname); buf->b_ffname = NULL; - vim_free(buf->b_sfname); + free(buf->b_sfname); buf->b_sfname = NULL; if (buf != curbuf) free_buffer(buf); @@ -1669,7 +1669,7 @@ buf_T *buflist_findname_exp(char_u *fname) ); if (ffname != NULL) { buf = buflist_findname(ffname); - vim_free(ffname); + free(ffname); } return buf; } @@ -1771,7 +1771,7 @@ buflist_findpat ( ++p; prog = vim_regcomp(p, p_magic ? RE_MAGIC : 0); if (prog == NULL) { - vim_free(pat); + free(pat); return -1; } @@ -1809,7 +1809,7 @@ buflist_findpat ( find_listed = FALSE; } - vim_free(pat); + free(pat); } if (match == -2) @@ -1856,7 +1856,7 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options) prog = vim_regcomp(patc + attempt * 11, RE_MAGIC); if (prog == NULL) { if (patc != pat) - vim_free(patc); + free(patc); return FAIL; } @@ -1894,7 +1894,7 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options) } if (patc != pat) - vim_free(patc); + free(patc); *num_file = count; return count == 0 ? FAIL : OK; @@ -1937,7 +1937,7 @@ static char_u *fname_match(regprog_T *prog, char_u *name) p = home_replace_save(NULL, name); if (p != NULL && vim_regexec(®match, p, (colnr_T)0)) match = name; - vim_free(p); + free(p); } } @@ -2226,8 +2226,8 @@ setfname ( if (ffname == NULL || *ffname == NUL) { /* Removing the name. */ - vim_free(buf->b_ffname); - vim_free(buf->b_sfname); + free(buf->b_ffname); + free(buf->b_sfname); buf->b_ffname = NULL; buf->b_sfname = NULL; #ifdef UNIX @@ -2257,7 +2257,7 @@ setfname ( if (obuf->b_ml.ml_mfp != NULL) { /* it's loaded, fail */ if (message) EMSG(_("E95: Buffer with this name already exists")); - vim_free(ffname); + free(ffname); return FAIL; } /* delete from the list */ @@ -2265,15 +2265,15 @@ setfname ( } sfname = vim_strsave(sfname); if (ffname == NULL || sfname == NULL) { - vim_free(sfname); - vim_free(ffname); + free(sfname); + free(ffname); return FAIL; } #ifdef USE_FNAME_CASE fname_case(sfname, 0); /* set correct case for short file name */ #endif - vim_free(buf->b_ffname); - vim_free(buf->b_sfname); + free(buf->b_ffname); + free(buf->b_sfname); buf->b_ffname = ffname; buf->b_sfname = sfname; } @@ -2302,8 +2302,8 @@ void buf_set_name(int fnum, char_u *name) buf = buflist_findnr(fnum); if (buf != NULL) { - vim_free(buf->b_sfname); - vim_free(buf->b_ffname); + free(buf->b_sfname); + free(buf->b_ffname); buf->b_ffname = vim_strsave(name); buf->b_sfname = NULL; /* Allocate ffname and expand into full path. Also resolves .lnk @@ -2595,7 +2595,7 @@ fileinfo ( set_keep_msg(p, 0); } - vim_free(buffer); + free(buffer); } void col_print(char_u *buf, size_t buflen, int col, int vcol) @@ -2670,7 +2670,7 @@ void maketitle(void) else { p = transstr(path_tail(curbuf->b_fname)); vim_strncpy(buf, p, SPACE_FOR_FNAME); - vim_free(p); + free(p); } switch (bufIsChanged(curbuf) @@ -2712,7 +2712,7 @@ void maketitle(void) if (off < SPACE_FOR_DIR) { p = transstr(buf + off); vim_strncpy(buf + off, p, (size_t)(SPACE_FOR_DIR - off)); - vim_free(p); + free(p); } else { vim_strncpy(buf + off, (char_u *)"...", (size_t)(SPACE_FOR_ARGNR - off)); @@ -2785,7 +2785,7 @@ static int ti_change(char_u *str, char_u **last) { if ((str == NULL) != (*last == NULL) || (str != NULL && *last != NULL && STRCMP(str, *last) != 0)) { - vim_free(*last); + free(*last); if (str == NULL) *last = NULL; else @@ -2806,8 +2806,8 @@ void resettitle(void) # if defined(EXITFREE) || defined(PROTO) void free_titles(void) { - vim_free(lasttitle); - vim_free(lasticon); + free(lasttitle); + free(lasticon); } # endif @@ -3159,7 +3159,7 @@ build_stl_str_hl ( if (str != NULL && *str != 0) { if (*skipdigits(str) == NUL) { num = atoi((char *)str); - vim_free(str); + free(str); str = NULL; itemisflag = FALSE; } @@ -3416,7 +3416,7 @@ build_stl_str_hl ( item[curitem].type = Empty; if (opt == STL_VIM_EXPR) - vim_free(str); + free(str); if (num >= 0 || (!itemisflag && str && *str)) prevchar_isflag = FALSE; /* Item not NULL, but not a flag */ @@ -3426,7 +3426,7 @@ build_stl_str_hl ( itemcnt = curitem; if (usefmt != fmt) - vim_free(usefmt); + free(usefmt); width = vim_strsize(out); if (maxwidth > 0 && width > maxwidth) { @@ -3624,7 +3624,7 @@ void fname_expand(buf_T *buf, char_u **ffname, char_u **sfname) /* If the file name is a shortcut file, use the file it links to. */ rfname = mch_resolve_shortcut(*ffname); if (rfname != NULL) { - vim_free(*ffname); + free(*ffname); *ffname = rfname; *sfname = rfname; } @@ -3882,7 +3882,7 @@ do_arg_all ( win_enter(new_curwin, FALSE); --autocmd_no_leave; - vim_free(opened); + free(opened); } /* @@ -4207,7 +4207,7 @@ chk_modeline ( sourcing_lnum = save_sourcing_lnum; sourcing_name = save_sourcing_name; - vim_free(linecopy); + free(linecopy); } return retval; } @@ -4254,7 +4254,7 @@ int read_viminfo_bufferlist(vir_T *virp, int writing) buflist_setfpos(buf, curwin, lnum, col, FALSE); } } - vim_free(xline); + free(xline); return viminfo_readline(virp); } @@ -4297,7 +4297,7 @@ void write_viminfo_bufferlist(FILE *fp) buf->b_last_cursor.col); viminfo_writestring(fp, line); } - vim_free(line); + free(line); } @@ -4472,7 +4472,7 @@ linenr_T buf_delsign( if (sign->id == id) { *lastp = next; lnum = sign->lnum; - vim_free(sign); + free(sign); break; } else { lastp = &sign->next; @@ -4537,7 +4537,7 @@ void buf_delete_signs(buf_T *buf) while (buf->b_signlist != NULL) { next = buf->b_signlist->next; - vim_free(buf->b_signlist); + free(buf->b_signlist); buf->b_signlist = next; } } @@ -4664,7 +4664,7 @@ int buf_contents_changed(buf_T *buf) } } } - vim_free(ea.cmd); + free(ea.cmd); /* restore curwin/curbuf and a few other things */ aucmd_restbuf(&aco); diff --git a/src/diff.c b/src/diff.c index 880ae9edef..a93f1324fe 100644 --- a/src/diff.c +++ b/src/diff.c @@ -405,7 +405,7 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, } } dprev->df_next = dp->df_next; - vim_free(dp); + free(dp); dp = dprev->df_next; } else { // Advance to next entry. @@ -428,7 +428,7 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, if (i == DB_COUNT) { diff_T *dnext = dp->df_next; - vim_free(dp); + free(dp); dp = dnext; if (dprev == NULL) { @@ -543,7 +543,7 @@ static void diff_check_unchanged(tabpage_T *tp, diff_T *dp) break; } } - vim_free(line_org); + free(line_org); // Stop when a line isn't equal in all diff buffers. if (i_new != DB_COUNT) { @@ -801,9 +801,9 @@ void ex_diffupdate(exarg_T *eap) diff_redraw(TRUE); theend: - vim_free(tmp_orig); - vim_free(tmp_new); - vim_free(tmp_diff); + free(tmp_orig); + free(tmp_new); + free(tmp_diff); } /// Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff". @@ -843,7 +843,7 @@ static void diff_file(char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff) NULL ); unblock_autocmds(); - vim_free(cmd); + free(cmd); } } @@ -1010,16 +1010,16 @@ theend: if (tmp_orig != NULL) { os_remove((char *)tmp_orig); } - vim_free(tmp_orig); + free(tmp_orig); if (tmp_new != NULL) { os_remove((char *)tmp_new); } - vim_free(tmp_new); - vim_free(newname); - vim_free(buf); + free(tmp_new); + free(newname); + free(buf); #ifdef UNIX - vim_free(fullname); + free(fullname); #endif // ifdef UNIX } @@ -1362,7 +1362,7 @@ static void diff_read(int idx_orig, int idx_new, char_u *fname) while (dn != dp->df_next) { dpl = dn->df_next; - vim_free(dn); + free(dn); dn = dpl; } } else { @@ -1429,7 +1429,7 @@ void diff_clear(tabpage_T *tp) diff_T *next_p; for (p = tp->tp_first_diff; p != NULL; p = next_p) { next_p = p->df_next; - vim_free(p); + free(p); } tp->tp_first_diff = NULL; } @@ -1584,7 +1584,7 @@ static int diff_equal_entry(diff_T *dp, int idx1, int idx2) } int cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2], dp->df_lnum[idx2] + i, FALSE)); - vim_free(line); + free(line); if (cmp != 0) { return FALSE; @@ -1892,7 +1892,7 @@ int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp) int idx = diff_buf_idx(wp->w_buffer); if (idx == DB_COUNT) { // cannot happen - vim_free(line_org); + free(line_org); return FALSE; } @@ -1905,7 +1905,7 @@ int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp) } if ((dp == NULL) || (diff_check_sanity(curtab, dp) == FAIL)) { - vim_free(line_org); + free(line_org); return FALSE; } @@ -1985,7 +1985,7 @@ int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp) } } - vim_free(line_org); + free(line_org); return added; } @@ -2284,7 +2284,7 @@ void ex_diffgetput(exarg_T *eap) p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from], nr, FALSE)); if (p != NULL) { ml_append(lnum + i - 1, p, 0, FALSE); - vim_free(p); + free(p); added++; if (buf_empty && (curbuf->b_ml.ml_line_count == 2)) { // Added the first line into an empty buffer, need to @@ -2340,7 +2340,7 @@ void ex_diffgetput(exarg_T *eap) if (dfree != NULL) { // Diff is deleted, update folds in other windows. diff_fold_update(dfree, idx_to); - vim_free(dfree); + free(dfree); } else { // mark_adjust() may have changed the count in a wrong way dp->df_count[idx_to] = new_count; diff --git a/src/digraph.c b/src/digraph.c index 88f183be4f..7ab8bd181d 100644 --- a/src/digraph.c +++ b/src/digraph.c @@ -1527,7 +1527,7 @@ static int getexactdigraph(int char1, int char2, int meta_char) if (to != NULL) { retval = (*mb_ptr2char)(to); - vim_free(to); + free(to); } (void)convert_setup(&vc, NULL, NULL); } @@ -1759,11 +1759,11 @@ char_u* keymap_init(void) curbuf->b_p_keymap); if (source_runtime(buf, FALSE) == FAIL) { - vim_free(buf); + free(buf); return (char_u *)N_("E544: Keymap file not found"); } } - vim_free(buf); + free(buf); } return NULL; @@ -1825,13 +1825,13 @@ void ex_loadkeymap(exarg_T *eap) if ((kp->to != NULL) && (*kp->to == NUL)) { EMSG(_("E791: Empty keymap entry")); } - vim_free(kp->from); - vim_free(kp->to); + free(kp->from); + free(kp->to); } else { ++curbuf->b_kmap_ga.ga_len; } } - vim_free(line); + free(line); } // setup ":lnoremap" to map the keys @@ -1869,8 +1869,8 @@ static void keymap_unload(void) for (i = 0; i < curbuf->b_kmap_ga.ga_len; ++i) { vim_snprintf((char *)buf, sizeof(buf), " %s", kp[i].from); (void)do_map(1, buf, LANGMAP, FALSE); - vim_free(kp[i].from); - vim_free(kp[i].to); + free(kp[i].from); + free(kp[i].to); } p_cpo = save_cpo; 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; } diff --git a/src/eval.c b/src/eval.c index df11174898..61a33c04d9 100644 --- a/src/eval.c +++ b/src/eval.c @@ -911,7 +911,7 @@ void eval_clear(void) for (i = 0; i < VV_LEN; ++i) { p = &vimvars[i]; if (p->vv_di.di_tv.v_type == VAR_STRING) { - vim_free(p->vv_str); + free(p->vv_str); p->vv_str = NULL; } else if (p->vv_di.di_tv.v_type == VAR_LIST) { list_unref(p->vv_list); @@ -937,7 +937,7 @@ void eval_clear(void) for (i = 1; i <= ga_scripts.ga_len; ++i) vars_clear(&SCRIPT_VARS(i)); for (i = 1; i <= ga_scripts.ga_len; ++i) - vim_free(SCRIPT_SV(i)); + free(SCRIPT_SV(i)); ga_clear(&ga_scripts); /* unreferenced lists and dicts */ @@ -1135,13 +1135,13 @@ void var_redir_stop(void) } /* free the collected output */ - vim_free(redir_ga.ga_data); + free(redir_ga.ga_data); redir_ga.ga_data = NULL; - vim_free(redir_lval); + free(redir_lval); redir_lval = NULL; } - vim_free(redir_varname); + free(redir_varname); redir_varname = NULL; } @@ -1460,7 +1460,7 @@ typval_T *eval_expr(char_u *arg, char_u **nextcmd) tv = (typval_T *)alloc(sizeof(typval_T)); if (tv != NULL && eval0(arg, tv, nextcmd, TRUE) == FAIL) { - vim_free(tv); + free(tv); tv = NULL; } @@ -1531,7 +1531,7 @@ call_vim_function ( --sandbox; restore_funccal(save_funccalp); } - vim_free(argvars); + free(argvars); if (ret == FAIL) clear_tv(rettv); @@ -2097,14 +2097,14 @@ static char_u *list_arg_vars(exarg_T *eap, char_u *arg, int *first) s == NULL ? (char_u *)"" : s, first); *arg = c; - vim_free(tf); + free(tf); } clear_tv(&tv); } } } - vim_free(tofree); + free(tofree); } arg = skipwhite(arg); @@ -2162,7 +2162,7 @@ ex_let_one ( if (s != NULL) { p = tofree = concat_str(s, p); if (mustfree) - vim_free(s); + free(s); } } if (p != NULL) { @@ -2177,7 +2177,7 @@ ex_let_one ( arg_end = arg; } name[len] = c1; - vim_free(tofree); + free(tofree); } } } @@ -2218,7 +2218,7 @@ ex_let_one ( n = numval - n; } else if (opt_type == 0 && stringval != NULL) { /* string */ s = concat_str(stringval, s); - vim_free(stringval); + free(stringval); stringval = s; } } @@ -2228,7 +2228,7 @@ ex_let_one ( arg_end = p; } *p = c1; - vim_free(stringval); + free(stringval); } } /* @@ -2250,14 +2250,14 @@ ex_let_one ( s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE); if (s != NULL) { p = ptofree = concat_str(s, p); - vim_free(s); + free(s); } } if (p != NULL) { write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE); arg_end = arg + 1; } - vim_free(ptofree); + free(ptofree); } } /* @@ -2619,8 +2619,8 @@ get_lval ( */ static void clear_lval(lval_T *lp) { - vim_free(lp->ll_exp_name); - vim_free(lp->ll_newkey); + free(lp->ll_exp_name); + free(lp->ll_newkey); } /* @@ -2698,7 +2698,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, ch if (di == NULL) return; if (dict_add(lp->ll_tv->vval.v_dict, di) == FAIL) { - vim_free(di); + free(di); return; } lp->ll_tv = &di->di_tv; @@ -2933,7 +2933,7 @@ void free_for_info(void *fi_void) list_rem_watch(fi->fi_list, &fi->fi_lw); list_unref(fi->fi_list); } - vim_free(fi); + free(fi); } @@ -3047,7 +3047,7 @@ void ex_call(exarg_T *eap) if (fudi.fd_newkey != NULL) { /* Still need to give an error message for missing key. */ EMSG2(_(e_dictkey), fudi.fd_newkey); - vim_free(fudi.fd_newkey); + free(fudi.fd_newkey); } if (tofree == NULL) return; @@ -3127,7 +3127,7 @@ void ex_call(exarg_T *eap) end: dict_unref(fudi.fd_dict); - vim_free(tofree); + free(tofree); } /* @@ -3439,7 +3439,7 @@ static char_u *cat_prefix_varname(int prefix, char_u *name) len = (int)STRLEN(name) + 3; if (len > varnamebuflen) { - vim_free(varnamebuf); + free(varnamebuf); len += 10; /* some additional space */ varnamebuf = alloc(len); if (varnamebuf == NULL) { @@ -3530,7 +3530,7 @@ char_u *get_user_var_name(expand_T *xp, int idx) if (vidx < VV_LEN) return cat_prefix_varname('v', (char_u *)vimvars[vidx++].vv_name); - vim_free(varnamebuf); + free(varnamebuf); varnamebuf = NULL; varnamebuflen = 0; return NULL; @@ -4537,7 +4537,7 @@ eval7 ( else ret = OK; } - vim_free(alias); + free(alias); } *arg = skipwhite(*arg); @@ -5181,9 +5181,9 @@ list_free ( if (recurse || (item->li_tv.v_type != VAR_LIST && item->li_tv.v_type != VAR_DICT)) clear_tv(&item->li_tv); - vim_free(item); + free(item); } - vim_free(l); + free(l); } /* @@ -5200,7 +5200,7 @@ listitem_T *listitem_alloc(void) void listitem_free(listitem_T *item) { clear_tv(&item->li_tv); - vim_free(item); + free(item); } /* @@ -5669,7 +5669,7 @@ static list_T *list_copy(list_T *orig, int deep, int copyID) break; if (deep) { if (item_copy(&item->li_tv, &ni->li_tv, deep, copyID) == FAIL) { - vim_free(ni); + free(ni); break; } } else @@ -5726,7 +5726,7 @@ static char_u *list2string(typval_T *tv, int copyID) ga_init(&ga, (int)sizeof(char), 80); ga_append(&ga, '['); if (list_join(&ga, tv->vval.v_list, (char_u *)", ", FALSE, copyID) == FAIL) { - vim_free(ga.ga_data); + free(ga.ga_data); return NULL; } ga_append(&ga, ']'); @@ -5824,7 +5824,7 @@ static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo_style, int if (join_ga.ga_data != NULL) { p = (join_T *)join_ga.ga_data; for (i = 0; i < join_ga.ga_len; ++i) { - vim_free(p->tofree); + free(p->tofree); ++p; } ga_clear(&join_ga); @@ -6139,12 +6139,12 @@ dict_free ( if (recurse || (di->di_tv.v_type != VAR_LIST && di->di_tv.v_type != VAR_DICT)) clear_tv(&di->di_tv); - vim_free(di); + free(di); --todo; } } hash_clear(&d->dv_hashtab); - vim_free(d); + free(d); } /* @@ -6203,7 +6203,7 @@ static void dictitem_remove(dict_T *dict, dictitem_T *item) void dictitem_free(dictitem_T *item) { clear_tv(&item->di_tv); - vim_free(item); + free(item); } /* @@ -6239,7 +6239,7 @@ static dict_T *dict_copy(dict_T *orig, int deep, int copyID) if (deep) { if (item_copy(&HI2DI(hi)->di_tv, &di->di_tv, deep, copyID) == FAIL) { - vim_free(di); + free(di); break; } } else @@ -6355,7 +6355,7 @@ dictitem_T *dict_find(dict_T *d, char_u *key, int len) } hi = hash_find(&d->dv_hashtab, akey); - vim_free(tofree); + free(tofree); if (HASHITEM_EMPTY(hi)) return NULL; return HI2DI(hi); @@ -6427,19 +6427,19 @@ static char_u *dict2string(typval_T *tv, int copyID) tofree = string_quote(hi->hi_key, FALSE); if (tofree != NULL) { ga_concat(&ga, tofree); - vim_free(tofree); + free(tofree); } ga_concat(&ga, (char_u *)": "); s = tv2string(&HI2DI(hi)->di_tv, &tofree, numbuf, copyID); if (s != NULL) ga_concat(&ga, s); - vim_free(tofree); + free(tofree); if (s == NULL) break; } } if (todo > 0) { - vim_free(ga.ga_data); + free(ga.ga_data); return NULL; } @@ -6738,7 +6738,7 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate) len = get_env_len(arg); if (evaluate) { - if (len == 0) { + if (len == 0) { return FAIL; // Can't be an environment variable. } cc = name[len]; @@ -6751,13 +6751,13 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate) } } else { if (mustfree) { - vim_free(string); + free(string); } // Next try expanding things like $VIM and ${HOME}. string = expand_env_save(name - 1); if (string != NULL && *string == '$') { - vim_free(string); + free(string); string = NULL; } } @@ -7420,8 +7420,8 @@ call_func ( } if (fname != name && fname != fname_buf) - vim_free(fname); - vim_free(name); + free(fname); + free(name); return ret; } @@ -7440,7 +7440,7 @@ static void emsg_funcname(char *ermsg, char_u *name) p = name; EMSG2(_(ermsg), p); if (p != name) - vim_free(p); + free(p); } /* @@ -8547,7 +8547,7 @@ static void f_exists(typval_T *argvars, typval_T *rettv) p = expand_env_save(p); if (p != NULL && *p != '$') n = TRUE; - vim_free(p); + free(p); } } else if (*p == '&' || *p == '+') { /* option */ n = (get_option_tv(&p, NULL, TRUE) == OK); @@ -8583,7 +8583,7 @@ static void f_exists(typval_T *argvars, typval_T *rettv) if (*p != NUL) n = FALSE; - vim_free(tofree); + free(tofree); } rettv->vval.v_number = n; @@ -8817,7 +8817,7 @@ static void f_feedkeys(typval_T *argvars, typval_T *rettv) if (keys_esc != NULL) { ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE), typebuf.tb_len, !typed, FALSE); - vim_free(keys_esc); + free(keys_esc); if (vgetc_busy) typebuf_was_filled = TRUE; } @@ -8896,7 +8896,7 @@ static void findfilendir(typval_T *argvars, typval_T *rettv, int find_what) if (*fname != NUL && !error) { do { if (rettv->v_type == VAR_STRING || rettv->v_type == VAR_LIST) - vim_free(fresult); + free(fresult); fresult = find_file_in_path_option(first ? fname : NULL, first ? (int)STRLEN(fname) : 0, 0, first, path, @@ -9160,7 +9160,7 @@ static void f_fnamemodify(typval_T *argvars, typval_T *rettv) rettv->vval.v_string = NULL; else rettv->vval.v_string = vim_strnsave(fname, len); - vim_free(fbuf); + free(fbuf); } static void foldclosed_both(typval_T *argvars, typval_T *rettv, int end); @@ -9645,7 +9645,7 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv) slash_adjust(rettv->vval.v_string); #endif } - vim_free(cwd); + free(cwd); } } @@ -10543,8 +10543,8 @@ static void f_iconv(typval_T *argvars, typval_T *rettv) rettv->vval.v_string = string_convert(&vimconv, str, NULL); convert_setup(&vimconv, NULL, NULL); - vim_free(from); - vim_free(to); + free(from); + free(to); } /* @@ -10690,7 +10690,7 @@ static void get_user_input(typval_T *argvars, typval_T *rettv, int inputdialog) rettv->vval.v_string = vim_strsave(get_tv_string_buf( &argvars[2], buf)); - vim_free(xp_arg); + free(xp_arg); /* since the user typed this, no need to wait for return */ need_wait_return = FALSE; @@ -11335,7 +11335,7 @@ static void get_maparg(typval_T *argvars, typval_T *rettv, int exact) keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, FALSE); rhs = check_map(keys, mode, exact, FALSE, abbr, &mp, &buffer_local); - vim_free(keys_buf); + free(keys_buf); if (!get_dict) { /* Return a string. */ @@ -11358,8 +11358,8 @@ static void get_maparg(typval_T *argvars, typval_T *rettv, int exact) dict_add_nr_str(dict, "nowait", mp->m_nowait ? 1L : 0L, NULL); dict_add_nr_str(dict, "mode", 0L, mapmode); - vim_free(lhs); - vim_free(mapmode); + free(lhs); + free(mapmode); } } @@ -11506,7 +11506,7 @@ static void find_some_match(typval_T *argvars, typval_T *rettv, int type) match = FALSE; break; } - vim_free(tofree); + free(tofree); str = echo_string(&li->li_tv, &tofree, strbuf, 0); if (str == NULL) break; @@ -11570,7 +11570,7 @@ static void find_some_match(typval_T *argvars, typval_T *rettv, int type) } theend: - vim_free(tofree); + free(tofree); p_cpo = save_cpo; } @@ -11763,7 +11763,7 @@ static int mkdir_recurse(char_u *dir, int prot) r = OK; else if (mkdir_recurse(updir, prot) == OK) r = vim_mkdir_emsg(updir, prot); - vim_free(updir); + free(updir); return r; } @@ -12117,7 +12117,7 @@ static void f_readfile(typval_T *argvars, typval_T *rettv) } if ((li = listitem_alloc()) == NULL) { - vim_free(s); + free(s); failed = TRUE; break; } @@ -12218,7 +12218,7 @@ static void f_readfile(typval_T *argvars, typval_T *rettv) rettv->vval.v_list = list_alloc(); } - vim_free(prev); + free(prev); fclose(fd); } @@ -12376,7 +12376,7 @@ static void f_remove(typval_T *argvars, typval_T *rettv) /* Remove one item, return its value. */ list_remove(l, item, item); *rettv = item->li_tv; - vim_free(item); + free(item); } else { /* Remove range of items, return list with values. */ end = get_tv_number_chk(&argvars[2], &error); @@ -12532,8 +12532,8 @@ static void f_resolve(typval_T *argvars, typval_T *rettv) buf[len] = NUL; if (limit-- == 0) { - vim_free(p); - vim_free(remain); + free(p); + free(remain); EMSG(_("E655: Too many symbolic links (cycle?)")); rettv->vval.v_string = NULL; goto fail; @@ -12553,7 +12553,7 @@ static void f_resolve(typval_T *argvars, typval_T *rettv) else { cpy = concat_str(q - 1, remain); if (cpy != NULL) { - vim_free(remain); + free(remain); remain = cpy; } } @@ -12572,11 +12572,11 @@ static void f_resolve(typval_T *argvars, typval_T *rettv) if (cpy != NULL) { STRCPY(cpy, p); STRCPY(path_tail(cpy), buf); - vim_free(p); + free(p); p = cpy; } } else { - vim_free(p); + free(p); p = vim_strsave(buf); } } @@ -12590,14 +12590,14 @@ static void f_resolve(typval_T *argvars, typval_T *rettv) cpy = vim_strnsave(p, STRLEN(p) + len); if (cpy != NULL) { STRNCAT(cpy, remain, len); - vim_free(p); + free(p); p = cpy; } /* Shorten "remain". */ if (*q != NUL) STRMOVE(remain, q - 1); else { - vim_free(remain); + free(remain); remain = NULL; } } @@ -12616,7 +12616,7 @@ static void f_resolve(typval_T *argvars, typval_T *rettv) /* Prepend "./". */ cpy = concat_str((char_u *)"./", p); if (cpy != NULL) { - vim_free(p); + free(p); p = cpy; } } else if (!is_relative_to_current) { @@ -12648,7 +12648,7 @@ static void f_resolve(typval_T *argvars, typval_T *rettv) #ifdef HAVE_READLINK fail: - vim_free(buf); + free(buf); #endif rettv->v_type = VAR_STRING; } @@ -13177,8 +13177,8 @@ do_searchpair ( curwin->w_cursor = save_cursor; theend: - vim_free(pat2); - vim_free(pat3); + free(pat2); + free(pat3); if (p_cpo == empty_option) p_cpo = save_cpo; else @@ -13265,7 +13265,7 @@ static void f_setbufvar(typval_T *argvars, typval_T *rettv) STRCPY(bufvarname, "b:"); STRCPY(bufvarname + 2, varname); set_var(bufvarname, varp, TRUE); - vim_free(bufvarname); + free(bufvarname); } } @@ -13577,7 +13577,7 @@ static void f_settabvar(typval_T *argvars, typval_T *rettv) STRCPY(tabvarname, "t:"); STRCPY(tabvarname + 2, varname); set_var(tabvarname, varp, TRUE); - vim_free(tabvarname); + free(tabvarname); } /* Restore current tabpage */ @@ -13647,7 +13647,7 @@ static void setwinvar(typval_T *argvars, typval_T *rettv, int off) STRCPY(winvarname, "w:"); STRCPY(winvarname + 2, varname); set_var(winvarname, varp, TRUE); - vim_free(winvarname); + free(winvarname); } } @@ -13760,8 +13760,8 @@ static int item_compare(const void *s1, const void *s2) res = STRICMP(p1, p2); else res = STRCMP(p1, p2); - vim_free(tofree1); - vim_free(tofree2); + free(tofree1); + free(tofree2); return res; } @@ -13920,7 +13920,7 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort) } } - vim_free(ptrs); + free(ptrs); } } @@ -14026,7 +14026,7 @@ static void f_spellsuggest(typval_T *argvars, typval_T *rettv) li = listitem_alloc(); if (li == NULL) - vim_free(str); + free(str); else { li->li_tv.v_type = VAR_STRING; li->li_tv.v_lock = 0; @@ -14194,7 +14194,7 @@ static void f_strftime(typval_T *argvars, typval_T *rettv) result_buf[0] = NUL; if (conv.vc_type != CONV_NONE) - vim_free(p); + free(p); convert_setup(&conv, enc, p_enc); if (conv.vc_type != CONV_NONE) rettv->vval.v_string = string_convert(&conv, result_buf, NULL); @@ -14203,7 +14203,7 @@ static void f_strftime(typval_T *argvars, typval_T *rettv) /* Release conversion descriptors */ convert_setup(&conv, NULL, NULL); - vim_free(enc); + free(enc); } } @@ -14720,7 +14720,7 @@ static void f_system(typval_T *argvars, typval_T *rettv) done: if (infile != NULL) { os_remove((char *)infile); - vim_free(infile); + free(infile); } rettv->v_type = VAR_STRING; rettv->vval.v_string = res; @@ -14851,7 +14851,7 @@ static void f_tagfiles(typval_T *argvars, typval_T *rettv) } tagname_free(&tn); - vim_free(fname); + free(fname); } /* @@ -15125,7 +15125,7 @@ static void f_undofile(typval_T *argvars, typval_T *rettv) if (ffname != NULL) rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE); - vim_free(ffname); + free(ffname); } } } @@ -15792,7 +15792,7 @@ static char_u *make_expanded_name(char_u *in_start, char_u *expr_start, char_u * STRCAT(retval, expr_end + 1); } } - vim_free(temp_result); + free(temp_result); *in_end = c1; /* put char back for error messages */ *expr_start = '{'; @@ -15804,7 +15804,7 @@ static char_u *make_expanded_name(char_u *in_start, char_u *expr_start, char_u * /* Further expansion! */ temp_result = make_expanded_name(retval, expr_start, expr_end, temp_result); - vim_free(retval); + free(retval); retval = temp_result; } } @@ -15905,7 +15905,7 @@ set_vim_var_string ( * Will always be invoked when "v:progname" is set. */ vimvars[VV_VERSION].vv_nr = VIM_VERSION_100; - vim_free(vimvars[idx].vv_str); + free(vimvars[idx].vv_str); if (val == NULL) vimvars[idx].vv_str = NULL; else if (len == -1) @@ -15985,7 +15985,7 @@ char_u *set_cmdarg(exarg_T *eap, char_u *oldarg) oldval = vimvars[VV_CMDARG].vv_str; if (eap == NULL) { - vim_free(oldval); + free(oldval); vimvars[VV_CMDARG].vv_str = oldarg; return NULL; } @@ -16171,7 +16171,7 @@ void free_tv(typval_T *varp) func_unref(varp->vval.v_string); /*FALLTHROUGH*/ case VAR_STRING: - vim_free(varp->vval.v_string); + free(varp->vval.v_string); break; case VAR_LIST: list_unref(varp->vval.v_list); @@ -16187,7 +16187,7 @@ void free_tv(typval_T *varp) EMSG2(_(e_intern2), "free_tv()"); break; } - vim_free(varp); + free(varp); } } @@ -16202,7 +16202,7 @@ void clear_tv(typval_T *varp) func_unref(varp->vval.v_string); /*FALLTHROUGH*/ case VAR_STRING: - vim_free(varp->vval.v_string); + free(varp->vval.v_string); varp->vval.v_string = NULL; break; case VAR_LIST: @@ -16602,7 +16602,7 @@ static void vars_clear_ext(hashtab_T *ht, int free_val) if (free_val) clear_tv(&v->di_tv); if ((v->di_flags & DI_FLAGS_FIX) == 0) - vim_free(v); + free(v); } } hash_clear(ht); @@ -16619,7 +16619,7 @@ static void delete_var(hashtab_T *ht, hashitem_T *hi) hash_remove(ht, hi); clear_tv(&di->di_tv); - vim_free(di); + free(di); } /* @@ -16635,7 +16635,7 @@ static void list_one_var(dictitem_T *v, char_u *prefix, int *first) s = echo_string(&v->di_tv, &tofree, numbuf, current_copyID); list_one_var_a(prefix, v->di_key, v->di_tv.v_type, s == NULL ? (char_u *)"" : s, first); - vim_free(tofree); + free(tofree); } static void @@ -16730,7 +16730,7 @@ set_var ( */ if (ht == &vimvarht) { if (v->di_tv.v_type == VAR_STRING) { - vim_free(v->di_tv.vval.v_string); + free(v->di_tv.vval.v_string); if (copy || tv->v_type != VAR_STRING) v->di_tv.vval.v_string = vim_strsave(get_tv_string(tv)); else { @@ -16770,7 +16770,7 @@ set_var ( return; STRCPY(v->di_key, varname); if (hash_add(ht, DI2HIKEY(v)) == FAIL) { - vim_free(v); + free(v); return; } v->di_flags = 0; @@ -17061,7 +17061,7 @@ void ex_echo(exarg_T *eap) (void)msg_outtrans_len_attr(p, 1, echo_attr); } } - vim_free(tofree); + free(tofree); } clear_tv(&rettv); arg = skipwhite(arg); @@ -17309,7 +17309,7 @@ void ex_function(exarg_T *eap) if (!aborting()) { if (!eap->skip && fudi.fd_newkey != NULL) EMSG2(_(e_dictkey), fudi.fd_newkey); - vim_free(fudi.fd_newkey); + free(fudi.fd_newkey); return; } else eap->skip = TRUE; @@ -17430,7 +17430,7 @@ void ex_function(exarg_T *eap) for (i = 0; i < newargs.ga_len; ++i) if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0) { EMSG2(_("E853: Duplicate argument name: %s"), arg); - vim_free(arg); + free(arg); goto erret; } @@ -17536,7 +17536,7 @@ void ex_function(exarg_T *eap) /* between ":append" and "." and between ":python <uf_args)); ga_clear_strings(&(fp->uf_lines)); - vim_free(name); + free(name); name = NULL; } } else { @@ -17686,7 +17686,7 @@ void ex_function(exarg_T *eap) /* Give the function a sequential number. Can only be used with a * Funcref! */ - vim_free(name); + free(name); sprintf(numbuf, "%d", ++func_nr); name = vim_strsave((char_u *)numbuf); if (name == NULL) @@ -17709,7 +17709,7 @@ void ex_function(exarg_T *eap) if (slen > plen && fnamecmp(p, sourcing_name + slen - plen) == 0) j = OK; - vim_free(scriptname); + free(scriptname); } } if (j == FAIL) { @@ -17729,12 +17729,12 @@ void ex_function(exarg_T *eap) /* add new dict entry */ fudi.fd_di = dictitem_alloc(fudi.fd_newkey); if (fudi.fd_di == NULL) { - vim_free(fp); + free(fp); goto erret; } if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL) { - vim_free(fudi.fd_di); - vim_free(fp); + free(fudi.fd_di); + free(fp); goto erret; } } else @@ -17771,9 +17771,9 @@ erret: ga_clear_strings(&newargs); ga_clear_strings(&newlines); ret_free: - vim_free(skip_until); - vim_free(fudi.fd_newkey); - vim_free(name); + free(skip_until); + free(fudi.fd_newkey); + free(name); did_emsg |= saved_did_emsg; need_wait_return |= saved_wait_return; } @@ -18088,7 +18088,7 @@ static int function_exists(char_u *name) * "funcname(...", not "funcname!...". */ if (p != NULL && (*nm == NUL || *nm == '(')) n = translated_function_exists(p); - vim_free(p); + free(p); return n; } @@ -18103,7 +18103,7 @@ char_u *get_expanded_name(char_u *name, int check) if (!check || translated_function_exists(p)) return p; - vim_free(p); + free(p); return NULL; } @@ -18215,7 +18215,7 @@ void func_dump_profile(FILE *fd) prof_sort_list(fd, sorttab, st_len, "SELF", TRUE); } - vim_free(sorttab); + free(sorttab); } static void @@ -18335,7 +18335,7 @@ script_autoload ( ret = TRUE; } - vim_free(tofree); + free(tofree); return ret; } @@ -18427,14 +18427,14 @@ void ex_delfunction(exarg_T *eap) p = eap->arg; name = trans_function_name(&p, eap->skip, 0, &fudi); - vim_free(fudi.fd_newkey); + free(fudi.fd_newkey); if (name == NULL) { if (fudi.fd_dict != NULL && !eap->skip) EMSG(_(e_funcref)); return; } if (!ends_excmd(*skipwhite(p))) { - vim_free(name); + free(name); EMSG(_(e_trailing)); return; } @@ -18444,7 +18444,7 @@ void ex_delfunction(exarg_T *eap) if (!eap->skip) fp = find_func(name); - vim_free(name); + free(name); if (!eap->skip) { if (fp == NULL) { @@ -18475,9 +18475,9 @@ static void func_free(ufunc_T *fp) /* clear this function */ ga_clear_strings(&(fp->uf_args)); ga_clear_strings(&(fp->uf_lines)); - vim_free(fp->uf_tml_count); - vim_free(fp->uf_tml_total); - vim_free(fp->uf_tml_self); + free(fp->uf_tml_count); + free(fp->uf_tml_total); + free(fp->uf_tml_self); /* remove the function from the function hashtable */ hi = hash_find(&func_hashtab, UF2HIKEY(fp)); @@ -18486,7 +18486,7 @@ static void func_free(ufunc_T *fp) else hash_remove(&func_hashtab, hi); - vim_free(fp); + free(fp); } /* @@ -18709,7 +18709,7 @@ call_user_func ( s = buf; } msg_puts(s); - vim_free(tofree); + free(tofree); } } } @@ -18791,7 +18791,7 @@ call_user_func ( s = buf; } smsg((char_u *)_("%s returning %s"), sourcing_name, s); - vim_free(tofree); + free(tofree); } } msg_puts((char_u *)"\n"); /* don't overwrite this either */ @@ -18800,7 +18800,7 @@ call_user_func ( --no_wait_return; } - vim_free(sourcing_name); + free(sourcing_name); sourcing_name = save_sourcing_name; sourcing_lnum = save_sourcing_lnum; current_SID = save_current_SID; @@ -18889,7 +18889,7 @@ free_funccal ( for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next) clear_tv(&li->li_tv); - vim_free(fc); + free(fc); } /* @@ -19016,7 +19016,7 @@ int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv) clear_tv(current_funccal->rettv); *current_funccal->rettv = *(typval_T *)rettv; if (!is_cmd) - vim_free(rettv); + free(rettv); } } @@ -19050,7 +19050,7 @@ char_u *get_return_cmd(void *rettv) STRNCPY(IObuff + 8, s, IOSIZE - 8); if (STRLEN(s) + 8 >= IOSIZE) STRCPY(IObuff + IOSIZE - 4, "..."); - vim_free(tofree); + free(tofree); return vim_strsave(IObuff); } @@ -19244,16 +19244,16 @@ int read_viminfo_varlist(vir_T *virp, int writing) * string. */ tv.v_type = VAR_STRING; else { - vim_free(tv.vval.v_string); + free(tv.vval.v_string); tv = *etv; - vim_free(etv); + free(etv); } } set_var(virp->vir_line + 1, &tv, FALSE); if (tv.v_type == VAR_STRING) - vim_free(tv.vval.v_string); + free(tv.vval.v_string); else if (tv.v_type == VAR_DICT || tv.v_type == VAR_LIST) clear_tv(&tv); } @@ -19299,7 +19299,7 @@ void write_viminfo_varlist(FILE *fp) p = echo_string(&this_var->di_tv, &tofree, numbuf, 0); if (p != NULL) viminfo_writestring(fp, p); - vim_free(tofree); + free(tofree); } } } @@ -19339,10 +19339,10 @@ int store_session_globals(FILE *fd) (this_var->di_tv.v_type == VAR_STRING) ? '"' : ' ') < 0) || put_eol(fd) == FAIL) { - vim_free(p); + free(p); return FAIL; } - vim_free(p); + free(p); } else if (this_var->di_tv.v_type == VAR_FLOAT && var_flavour(this_var->di_key) == VAR_FLAVOUR_SESSION) { float_T f = this_var->di_tv.vval.v_float; @@ -19376,7 +19376,7 @@ void last_set_msg(scid_T scriptID) verbose_enter(); MSG_PUTS(_("\n\tLast set from ")); MSG_PUTS(p); - vim_free(p); + free(p); verbose_leave(); } } @@ -19457,7 +19457,7 @@ repeat: #endif ) { *fnamep = expand_env_save(*fnamep); - vim_free(*bufp); /* free any allocated file name */ + free(*bufp); /* free any allocated file name */ *bufp = *fnamep; if (*fnamep == NULL) return -1; @@ -19477,7 +19477,7 @@ repeat: /* FullName_save() is slow, don't use it when not needed. */ if (*p != NUL || !vim_isAbsName(*fnamep)) { *fnamep = FullName_save(*fnamep, *p != NUL); - vim_free(*bufp); /* free any allocated file name */ + free(*bufp); /* free any allocated file name */ *bufp = *fnamep; if (*fnamep == NULL) return -1; @@ -19487,7 +19487,7 @@ repeat: if (os_isdir(*fnamep)) { /* Make room for one or two extra characters. */ *fnamep = vim_strnsave(*fnamep, (int)STRLEN(*fnamep) + 2); - vim_free(*bufp); /* free any allocated file name */ + free(*bufp); /* free any allocated file name */ *bufp = *fnamep; if (*fnamep == NULL) return -1; @@ -19523,7 +19523,7 @@ repeat: if (s != NULL) { *fnamep = s; if (pbuf != NULL) { - vim_free(*bufp); /* free any allocated file name */ + free(*bufp); /* free any allocated file name */ *bufp = pbuf; pbuf = NULL; } @@ -19535,12 +19535,12 @@ repeat: s = vim_strsave(dirname); if (s != NULL) { *fnamep = s; - vim_free(*bufp); + free(*bufp); *bufp = s; } } } - vim_free(pbuf); + free(pbuf); } } @@ -19561,7 +19561,7 @@ repeat: p = vim_strsave((char_u *)"."); if (p == NULL) return -1; - vim_free(*bufp); + free(*bufp); *bufp = *fnamep = tail = p; *fnamelen = 1; } else { @@ -19649,15 +19649,15 @@ repeat: if (s != NULL) { *fnamep = s; *fnamelen = (int)STRLEN(s); - vim_free(*bufp); + free(*bufp); *bufp = s; didit = TRUE; } } - vim_free(sub); - vim_free(str); + free(sub); + free(str); } - vim_free(pat); + free(pat); } } /* after using ":s", repeat all the modifiers */ @@ -19668,7 +19668,7 @@ repeat: if (src[*usedlen] == ':' && src[*usedlen + 1] == 'S') { p = vim_strsave_shellescape(*fnamep, false, false); - vim_free(*bufp); + free(*bufp); *bufp = *fnamep = p; *fnamelen = (int)STRLEN(p); *usedlen += 2; diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 7723dda267..6a6b2fc615 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -533,9 +533,9 @@ void ex_sort(exarg_T *eap) beginline(BL_WHITE | BL_FIX); sortend: - vim_free(nrs); - vim_free(sortbuf1); - vim_free(sortbuf2); + free(nrs); + free(sortbuf1); + free(sortbuf2); vim_regfree(regmatch.regprog); if (got_int) EMSG(_(e_interr)); @@ -701,7 +701,7 @@ int do_move(linenr_T line1, linenr_T line2, linenr_T dest) str = vim_strsave(ml_get(l + extra)); if (str != NULL) { ml_append(dest + l - line1, str, (colnr_T)0, FALSE); - vim_free(str); + free(str); if (dest < line1) extra++; } @@ -809,7 +809,7 @@ void ex_copy(linenr_T line1, linenr_T line2, linenr_T n) p = vim_strsave(ml_get(line1)); if (p != NULL) { ml_append(curwin->w_cursor.lnum, p, (colnr_T)0, FALSE); - vim_free(p); + free(p); } /* situation 2: skip already copied lines */ if (line1 == n) @@ -832,7 +832,7 @@ static char_u *prevcmd = NULL; /* the previous command */ #if defined(EXITFREE) || defined(PROTO) void free_prev_shellcmd(void) { - vim_free(prevcmd); + free(prevcmd); } #endif @@ -883,7 +883,7 @@ void do_bang(int addr_count, exarg_T *eap, int forceit, int do_in, int do_out) if (ins_prevcmd) { if (prevcmd == NULL) { EMSG(_(e_noprev)); - vim_free(newcmd); + free(newcmd); return; } len += (int)STRLEN(prevcmd); @@ -896,7 +896,7 @@ void do_bang(int addr_count, exarg_T *eap, int forceit, int do_in, int do_out) STRCAT(t, prevcmd); p = t + STRLEN(t); STRCAT(t, trailarg); - vim_free(newcmd); + free(newcmd); newcmd = t; /* @@ -919,7 +919,7 @@ void do_bang(int addr_count, exarg_T *eap, int forceit, int do_in, int do_out) } } while (trailarg != NULL); - vim_free(prevcmd); + free(prevcmd); prevcmd = newcmd; if (bangredo) { /* put cmd in redo buffer for ! command */ @@ -929,7 +929,7 @@ void do_bang(int addr_count, exarg_T *eap, int forceit, int do_in, int do_out) char_u *cmd = vim_strsave_escaped(prevcmd, (char_u *)"%#"); AppendToRedobuffLit(cmd, -1); - vim_free(cmd); + free(cmd); AppendToRedobuff((char_u *)"\n"); bangredo = FALSE; } @@ -960,7 +960,7 @@ void do_bang(int addr_count, exarg_T *eap, int forceit, int do_in, int do_out) apply_autocmds(EVENT_SHELLFILTERPOST, NULL, NULL, FALSE, curbuf); } if (free_newcmd) - vim_free(newcmd); + free(newcmd); } /* @@ -1085,7 +1085,7 @@ do_filter ( if (do_out) { if (u_save((linenr_T)(line2), (linenr_T)(line2 + 1)) == FAIL) { - vim_free(cmd_buf); + free(cmd_buf); goto error; } redraw_curbuf_later(VALID); @@ -1109,7 +1109,7 @@ do_filter ( redraw_later_clear(); wait_return(FALSE); } - vim_free(cmd_buf); + free(cmd_buf); did_check_timestamps = FALSE; need_check_timestamps = TRUE; @@ -1206,8 +1206,8 @@ filterend: os_remove((char *)itmp); if (otmp != NULL) os_remove((char *)otmp); - vim_free(itmp); - vim_free(otmp); + free(itmp); + free(otmp); } /* @@ -1480,7 +1480,7 @@ read_viminfo ( verbose_leave(); } - vim_free(fname); + free(fname); if (fp == NULL) return FAIL; @@ -1590,7 +1590,7 @@ void write_viminfo(char_u *file, int forceit) * write the viminfo file then. */ if (*wp == 'a') { - vim_free(tempname); + free(tempname); tempname = NULL; break; } @@ -1626,7 +1626,7 @@ void write_viminfo(char_u *file, int forceit) * "normal" temp file. */ if (fp_out == NULL) { - vim_free(tempname); + free(tempname); if ((tempname = vim_tempname('o')) != NULL) fp_out = mch_fopen((char *)tempname, WRITEBIN); } @@ -1676,8 +1676,8 @@ void write_viminfo(char_u *file, int forceit) } end: - vim_free(fname); - vim_free(tempname); + free(fname); + free(tempname); } /* @@ -1758,7 +1758,7 @@ static void do_viminfo(FILE *fp_in, FILE *fp_out, int flags) && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT))) copy_viminfo_marks(&vir, fp_out, count, eof, flags); - vim_free(vir.vir_line); + free(vir.vir_line); if (vir.vir_conv.vc_type != CONV_NONE) convert_setup(&vir.vir_conv, NULL, NULL); } @@ -1929,7 +1929,7 @@ viminfo_readstring ( if (convert && virp->vir_conv.vc_type != CONV_NONE && *retval != NUL) { d = string_convert(&virp->vir_conv, retval, NULL); if (d != NULL) { - vim_free(retval); + free(retval); retval = d; } } @@ -2059,8 +2059,8 @@ int rename_buffer(char_u *new_fname) if (buf != NULL && !cmdmod.keepalt) curwin->w_alt_fnum = buf->b_fnum; } - vim_free(fname); - vim_free(sfname); + free(fname); + free(sfname); apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf); /* Change directories when the 'acd' option is set. */ do_autochdir(); @@ -2265,7 +2265,7 @@ int do_write(exarg_T *eap) } theend: - vim_free(free_fname); + free(free_fname); return retval; } @@ -2338,7 +2338,7 @@ check_overwrite ( copy_option_part(&p, dir, MAXPATHL, ","); } swapname = makeswapname(fname, ffname, curbuf, dir); - vim_free(dir); + free(dir); if (os_file_exists(swapname)) { if (p_confirm || cmdmod.confirm) { char_u buff[DIALOG_MSG_SIZE]; @@ -2348,18 +2348,18 @@ check_overwrite ( swapname); if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) != VIM_YES) { - vim_free(swapname); + free(swapname); return FAIL; } eap->forceit = TRUE; } else { EMSG2(_("E768: Swap file exists: %s (:silent! overrides)"), swapname); - vim_free(swapname); + free(swapname); return FAIL; } } - vim_free(swapname); + free(swapname); } } return OK; @@ -2545,7 +2545,7 @@ int getfile(int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, retval = 1; /* error encountered */ theend: - vim_free(free_me); + free(free_me); return retval; } @@ -2682,7 +2682,7 @@ do_ecmd ( } set_vim_var_string(VV_SWAPCOMMAND, p, -1); did_set_swapcommand = TRUE; - vim_free(p); + free(p); } /* @@ -2771,7 +2771,7 @@ do_ecmd ( goto theend; } if (aborting()) { /* autocmds may abort script processing */ - vim_free(new_name); + free(new_name); goto theend; } if (buf == curbuf) /* already in new buffer */ @@ -2793,7 +2793,7 @@ do_ecmd ( win_close(oldwin, FALSE); if (aborting()) { /* autocmds may abort script processing */ - vim_free(new_name); + free(new_name); goto theend; } /* Be careful again, like above. */ @@ -2831,7 +2831,7 @@ do_ecmd ( did_get_winopts = TRUE; } - vim_free(new_name); + free(new_name); au_new_curbuf = NULL; } else ++curbuf->b_nwindows; @@ -2943,7 +2943,7 @@ do_ecmd ( delbuf_msg(new_name); /* frees new_name */ goto theend; } - vim_free(new_name); + free(new_name); /* If autocommands change buffers under our fingers, forget about * re-editing the file. Should do the buf_clear_file(), but perhaps @@ -3141,7 +3141,7 @@ do_ecmd ( theend: if (did_set_swapcommand) set_vim_var_string(VV_SWAPCOMMAND, NULL, -1); - vim_free(free_fname); + free(free_fname); return retval; } @@ -3149,7 +3149,7 @@ static void delbuf_msg(char_u *name) { EMSG2(_("E143: Autocommands unexpectedly deleted new buffer %s"), name == NULL ? (char_u *)"" : name); - vim_free(name); + free(name); au_new_curbuf = NULL; } @@ -3235,7 +3235,7 @@ void ex_append(exarg_T *eap) if ((p[0] == '.' && p[1] == NUL) || (!did_undo && u_save(lnum, lnum + 1 + (empty ? 1 : 0)) == FAIL)) { - vim_free(theline); + free(theline); break; } @@ -3247,7 +3247,7 @@ void ex_append(exarg_T *eap) ml_append(lnum, theline, (colnr_T)0, FALSE); appended_lines_mark(lnum, 1L); - vim_free(theline); + free(theline); ++lnum; if (empty) { @@ -3580,7 +3580,7 @@ void do_sub(exarg_T *eap) } sub = old_sub; } else { - vim_free(old_sub); + free(old_sub); old_sub = vim_strsave(sub); } } @@ -3834,7 +3834,7 @@ void do_sub(exarg_T *eap) lnum += regmatch.startpos[0].lnum; sub_firstlnum += regmatch.startpos[0].lnum;