mirror of
https://github.com/neovim/neovim.git
synced 2025-09-15 07:48:18 +00:00
Replace alloc() with xmalloc() and remove immediate OOM checks
This commit is contained in:
@@ -312,10 +312,11 @@ FullName_save (
|
||||
|
||||
char_u *buf = xmalloc(MAXPATHL);
|
||||
|
||||
if (vim_FullName(fname, buf, MAXPATHL, force) != FAIL)
|
||||
if (vim_FullName(fname, buf, MAXPATHL, force) != FAIL) {
|
||||
new_fname = vim_strsave(buf);
|
||||
else
|
||||
} else {
|
||||
new_fname = vim_strsave(fname);
|
||||
}
|
||||
free(buf);
|
||||
|
||||
return new_fname;
|
||||
@@ -379,7 +380,7 @@ unix_expandpath (
|
||||
}
|
||||
|
||||
/* make room for file name */
|
||||
buf = alloc((int)STRLEN(path) + BASENAMELEN + 5);
|
||||
buf = xmalloc(STRLEN(path) + BASENAMELEN + 5);
|
||||
|
||||
/*
|
||||
* Find the first part in the path name that contains a wildcard.
|
||||
@@ -608,7 +609,7 @@ static void expand_path_option(char_u *curdir, garray_T *gap)
|
||||
char_u *p;
|
||||
int len;
|
||||
|
||||
buf = alloc((int)MAXPATHL);
|
||||
buf = xmalloc(MAXPATHL);
|
||||
|
||||
while (*path_option != NUL) {
|
||||
copy_option_part(&path_option, buf, MAXPATHL, " ,");
|
||||
@@ -720,7 +721,7 @@ static void uniquefy_paths(garray_T *gap, char_u *pattern)
|
||||
* possible patterns?
|
||||
*/
|
||||
len = (int)STRLEN(pattern);
|
||||
file_pattern = alloc(len + 2);
|
||||
file_pattern = xmalloc(len + 2);
|
||||
file_pattern[0] = '*';
|
||||
file_pattern[1] = NUL;
|
||||
STRCAT(file_pattern, pattern);
|
||||
@@ -735,7 +736,7 @@ static void uniquefy_paths(garray_T *gap, char_u *pattern)
|
||||
if (regmatch.regprog == NULL)
|
||||
return;
|
||||
|
||||
curdir = alloc((int)(MAXPATHL));
|
||||
curdir = xmalloc(MAXPATHL);
|
||||
os_dirname(curdir, MAXPATHL);
|
||||
expand_path_option(curdir, &path_ga);
|
||||
|
||||
@@ -811,7 +812,7 @@ static void uniquefy_paths(garray_T *gap, char_u *pattern)
|
||||
continue;
|
||||
}
|
||||
|
||||
rel_path = alloc((int)(STRLEN(short_name) + STRLEN(PATHSEPSTR) + 2));
|
||||
rel_path = xmalloc(STRLEN(short_name) + STRLEN(PATHSEPSTR) + 2);
|
||||
STRCPY(rel_path, ".");
|
||||
add_pathsep(rel_path);
|
||||
STRCAT(rel_path, short_name);
|
||||
@@ -884,7 +885,7 @@ expand_in_path (
|
||||
char_u *e; /* end */
|
||||
char_u *paths = NULL;
|
||||
|
||||
curdir = alloc((unsigned)MAXPATHL);
|
||||
curdir = xmalloc(MAXPATHL);
|
||||
os_dirname(curdir, MAXPATHL);
|
||||
|
||||
ga_init(&path_ga, (int)sizeof(char_u *), 1);
|
||||
@@ -1206,7 +1207,7 @@ addfile (
|
||||
/* Make room for another item in the file list. */
|
||||
ga_grow(gap, 1);
|
||||
|
||||
p = alloc((unsigned)(STRLEN(f) + 1 + isdir));
|
||||
p = xmalloc(STRLEN(f) + 1 + isdir);
|
||||
|
||||
STRCPY(p, f);
|
||||
#ifdef BACKSLASH_IN_FILENAME
|
||||
|
Reference in New Issue
Block a user