diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-04-13 09:30:57 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-04-13 09:30:57 -0300 |
| commit | a9ee85b9fc2d4e3faa466e9c3062cd41315f8456 (patch) | |
| tree | e45187575c9f0397c5d717780b61adf5b3976a62 /src/nvim/ex_eval.c | |
| parent | 0248c75bc190ec2fbc8f3af3d61f771e76d628d6 (diff) | |
| parent | 2d104f14dbd2c60a30e9e1e0fef098b39db087db (diff) | |
| download | rneovim-a9ee85b9fc2d4e3faa466e9c3062cd41315f8456.tar.gz rneovim-a9ee85b9fc2d4e3faa466e9c3062cd41315f8456.tar.bz2 rneovim-a9ee85b9fc2d4e3faa466e9c3062cd41315f8456.zip | |
Merge PR #2415 'Use jemalloc instead of libc allocator'
Diffstat (limited to 'src/nvim/ex_eval.c')
| -rw-r--r-- | src/nvim/ex_eval.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index d2774804f8..5ed7a35209 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -281,8 +281,8 @@ static void free_msglist(struct msglist *l) messages = l; while (messages != NULL) { next = messages->next; - free(messages->msg); - free(messages); + xfree(messages->msg); + xfree(messages); messages = next; } } @@ -505,7 +505,7 @@ static int throw_exception(void *value, int type, char_u *cmdname) return OK; nomem: - free(excp); + xfree(excp); suppress_errthrow = TRUE; EMSG(_(e_outofmem)); fail: @@ -550,14 +550,14 @@ static void discard_exception(except_T *excp, int was_finished) else verbose_leave(); STRCPY(IObuff, saved_IObuff); - free(saved_IObuff); + xfree(saved_IObuff); } if (excp->type != ET_INTERRUPT) - free(excp->value); + xfree(excp->value); if (excp->type == ET_ERROR) free_msglist(excp->messages); - free(excp->throw_name); - free(excp); + xfree(excp->throw_name); + xfree(excp); } /* @@ -727,9 +727,9 @@ static void report_pending(int action, int pending, void *value) msg_silent = save_msg_silent; if (pending == CSTP_RETURN) - free(s); + xfree(s); else if (pending & CSTP_THROW) - free(mesg); + xfree(mesg); } /* @@ -1165,7 +1165,7 @@ void ex_throw(exarg_T *eap) * not throw. */ if (!eap->skip && value != NULL) { if (throw_exception(value, ET_USER, NULL) == FAIL) - free(value); + xfree(value); else do_throw(eap->cstack); } @@ -1977,7 +1977,7 @@ int cleanup_conditionals(struct condstack *cstack, int searched_cond, int inclus elem = cstack->cs_emsg_silent_list; cstack->cs_emsg_silent_list = elem->next; emsg_silent = elem->saved_emsg_silent; - free(elem); + xfree(elem); cstack->cs_flags[idx] &= ~CSF_SILENT; } if (stop) |