mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Problem: Alloc() returning "char_u *" causes a lot of type casts. Solution: Have it return "void *". (Mike Williams) Define ALLOC_ONE() to check the simple allocations.
This commit is contained in:
10
src/buffer.c
10
src/buffer.c
@@ -1958,7 +1958,7 @@ buflist_new(
|
||||
}
|
||||
if (buf != curbuf || curbuf == NULL)
|
||||
{
|
||||
buf = (buf_T *)alloc_clear(sizeof(buf_T));
|
||||
buf = ALLOC_CLEAR_ONE(buf_T);
|
||||
if (buf == NULL)
|
||||
{
|
||||
vim_free(ffname);
|
||||
@@ -1985,7 +1985,7 @@ buflist_new(
|
||||
}
|
||||
|
||||
clear_wininfo(buf);
|
||||
buf->b_wininfo = (wininfo_T *)alloc_clear(sizeof(wininfo_T));
|
||||
buf->b_wininfo = ALLOC_CLEAR_ONE(wininfo_T);
|
||||
|
||||
if ((ffname != NULL && (buf->b_ffname == NULL || buf->b_sfname == NULL))
|
||||
|| buf->b_wininfo == NULL)
|
||||
@@ -2634,7 +2634,7 @@ ExpandBufnames(
|
||||
break;
|
||||
if (round == 1)
|
||||
{
|
||||
*file = (char_u **)alloc(count * sizeof(char_u *));
|
||||
*file = ALLOC_MULT(char_u *, count);
|
||||
if (*file == NULL)
|
||||
{
|
||||
vim_regfree(regmatch.regprog);
|
||||
@@ -2771,7 +2771,7 @@ buflist_setfpos(
|
||||
if (wip == NULL)
|
||||
{
|
||||
/* allocate a new entry */
|
||||
wip = (wininfo_T *)alloc_clear(sizeof(wininfo_T));
|
||||
wip = ALLOC_CLEAR_ONE(wininfo_T);
|
||||
if (wip == NULL)
|
||||
return;
|
||||
wip->wi_win = win;
|
||||
@@ -3430,7 +3430,7 @@ fileinfo(
|
||||
char *buffer;
|
||||
size_t len;
|
||||
|
||||
buffer = (char *)alloc(IOSIZE);
|
||||
buffer = alloc(IOSIZE);
|
||||
if (buffer == NULL)
|
||||
return;
|
||||
|
||||
|
Reference in New Issue
Block a user