diff options
Diffstat (limited to 'src/regexp.c')
-rw-r--r-- | src/regexp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/regexp.c b/src/regexp.c index d84536dafe..73226065d8 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -1173,7 +1173,7 @@ static void bt_regfree(regprog_T *prog); * This also means that we don't allocate space until we are sure that the * thing really will compile successfully, and we never have to move the * code and thus invalidate pointers into it. (Note that it has to be in - * one piece because vim_free() must be able to free it all.) + * one piece because free() must be able to free it all.) * * Whether upper/lower case is to be ignored is decided when executing the * program, it does not matter here. @@ -1220,7 +1220,7 @@ static regprog_T *bt_regcomp(char_u *expr, int re_flags) regcode = r->program; regc(REGMAGIC); if (reg(REG_NOPAREN, &flags) == NULL || reg_toolong) { - vim_free(r); + free(r); if (reg_toolong) EMSG_RET_NULL(_("E339: Pattern too long")); return NULL; @@ -1302,7 +1302,7 @@ static regprog_T *bt_regcomp(char_u *expr, int re_flags) */ static void bt_regfree(regprog_T *prog) { - vim_free(prog); + free(prog); } /* @@ -3255,8 +3255,8 @@ void free_regexp_stuff(void) { ga_clear(®stack); ga_clear(&backpos); - vim_free(reg_tofree); - vim_free(reg_prev_sub); + free(reg_tofree); + free(reg_prev_sub); } #endif @@ -3533,7 +3533,7 @@ theend: /* Free "reg_tofree" when it's a bit big. * Free regstack and backpos if they are bigger than their initial size. */ if (reg_tofreelen > 400) { - vim_free(reg_tofree); + free(reg_tofree); reg_tofree = NULL; } if (regstack.ga_maxlen > REGSTACK_INITIAL) @@ -3576,8 +3576,8 @@ void unref_extmatch(reg_extmatch_T *em) if (em != NULL && --em->refcnt <= 0) { for (i = 0; i < NSUBEXP; ++i) - vim_free(em->matches[i]); - vim_free(em); + free(em->matches[i]); + free(em); } } @@ -5653,7 +5653,7 @@ static int match_with_backref(linenr_T start_lnum, colnr_T start_col, linenr_T e len = (int)STRLEN(regline); if (reg_tofree == NULL || len >= (int)reg_tofreelen) { len += 50; /* get some extra */ - vim_free(reg_tofree); + free(reg_tofree); reg_tofree = alloc(len); reg_tofreelen = len; } @@ -6417,7 +6417,7 @@ char_u *regtilde(char_u *source, int magic) STRCPY(tmpsub + len + prevlen, p + 1); if (newsub != source) /* already allocated newsub */ - vim_free(newsub); + free(newsub); newsub = tmpsub; p = newsub + len + prevlen; } else if (magic) @@ -6433,7 +6433,7 @@ char_u *regtilde(char_u *source, int magic) } } - vim_free(reg_prev_sub); + free(reg_prev_sub); if (newsub != source) /* newsub was allocated, just keep it */ reg_prev_sub = newsub; else /* no ~ found, need to save newsub */ @@ -6529,14 +6529,14 @@ static int vim_regsub_both(char_u *source, char_u *dest, int copy, int magic, in if (eval_result != NULL) { STRCPY(dest, eval_result); dst += STRLEN(eval_result); - vim_free(eval_result); + free(eval_result); eval_result = NULL; } } else { win_T *save_reg_win; int save_ireg_ic; - vim_free(eval_result); + free(eval_result); /* The expression may contain substitute(), which calls us * recursively. Make sure submatch() gets the text from the first @@ -6578,7 +6578,7 @@ static int vim_regsub_both(char_u *source, char_u *dest, int copy, int magic, in /* Backslashes will be consumed, need to double them. */ s = vim_strsave_escaped(eval_result, (char_u *)"\\"); if (s != NULL) { - vim_free(eval_result); + free(eval_result); eval_result = s; } } |