aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/os_unix.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2015-04-12 11:37:22 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2015-04-13 08:22:44 -0300
commit34c48aaf123ffd8aec31b79f0b4d16d9a63fe59b (patch)
tree3342c6d4a1cc54bbadb6018725410117885b3517 /src/nvim/os_unix.c
parentba10e311bddab18e38b1b706e232f804c2da9174 (diff)
downloadrneovim-34c48aaf123ffd8aec31b79f0b4d16d9a63fe59b.tar.gz
rneovim-34c48aaf123ffd8aec31b79f0b4d16d9a63fe59b.tar.bz2
rneovim-34c48aaf123ffd8aec31b79f0b4d16d9a63fe59b.zip
memory: Add `free` wrapper and refactor project to use it
We already use wrappers for allocation, the new `xfree` function is the equivalent for deallocation and provides a way to fully replace the malloc implementation used by Neovim.
Diffstat (limited to 'src/nvim/os_unix.c')
-rw-r--r--src/nvim/os_unix.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 26a4cdb083..e69b5ccc27 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -435,11 +435,11 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
if (ampersent)
os_delay(10L, true);
- free(command);
+ xfree(command);
if (i) { /* os_call_shell() failed */
os_remove((char *)tempname);
- free(tempname);
+ xfree(tempname);
/*
* With interactive completion, the error message is not printed.
*/
@@ -472,18 +472,18 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
MSG(_(e_wildexpand));
msg_start(); /* don't overwrite this message */
}
- free(tempname);
+ xfree(tempname);
goto notfound;
}
int fseek_res = fseek(fd, 0L, SEEK_END);
if (fseek_res < 0) {
- free(tempname);
+ xfree(tempname);
fclose(fd);
return FAIL;
}
long long templen = ftell(fd); /* get size of temp file */
if (templen < 0) {
- free(tempname);
+ xfree(tempname);
fclose(fd);
return FAIL;
}
@@ -501,11 +501,11 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
if (readlen != len) {
/* unexpected read error */
EMSG2(_(e_notread), tempname);
- free(tempname);
- free(buffer);
+ xfree(tempname);
+ xfree(buffer);
return FAIL;
}
- free(tempname);
+ xfree(tempname);
/* file names are separated with Space */
if (shell_style == STYLE_ECHO) {
@@ -574,7 +574,7 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
* /bin/sh will happily expand it to nothing rather than returning an
* error; and hey, it's good to check anyway -- webb.
*/
- free(buffer);
+ xfree(buffer);
goto notfound;
}
*num_file = i;
@@ -628,11 +628,11 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
add_pathsep(p); /* add '/' to a directory name */
(*file)[j++] = p;
}
- free(buffer);
+ xfree(buffer);
*num_file = j;
if (*num_file == 0) { /* rejected all entries */
- free(*file);
+ xfree(*file);
*file = NULL;
goto notfound;
}