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.
diff --git a/src/os_win32.c b/src/os_win32.c
index 6a832cf..60bf341 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2075,7 +2075,7 @@
return FALSE;
wcurpath = _wgetenv(L"PATH");
- wnewpath = (WCHAR *)alloc((wcslen(wcurpath) + 3) * sizeof(WCHAR));
+ wnewpath = ALLOC_MULT(WCHAR, wcslen(wcurpath) + 3);
if (wnewpath == NULL)
return FALSE;
wcscpy(wnewpath, L".;");
@@ -2338,7 +2338,7 @@
cb->BufferSize.Y = cb->Info.dwSize.Y;
NumCells = cb->BufferSize.X * cb->BufferSize.Y;
vim_free(cb->Buffer);
- cb->Buffer = (PCHAR_INFO)alloc(NumCells * sizeof(CHAR_INFO));
+ cb->Buffer = ALLOC_MULT(CHAR_INFO, NumCells);
if (cb->Buffer == NULL)
return FALSE;
}
@@ -2362,7 +2362,7 @@
{
cb->NumRegions = numregions;
vim_free(cb->Regions);
- cb->Regions = (PSMALL_RECT)alloc(cb->NumRegions * sizeof(SMALL_RECT));
+ cb->Regions = ALLOC_MULT(SMALL_RECT, cb->NumRegions);
if (cb->Regions == NULL)
{
VIM_CLEAR(cb->Buffer);
@@ -3394,7 +3394,7 @@
struct my_acl *p = NULL;
DWORD err;
- p = (struct my_acl *)alloc_clear(sizeof(struct my_acl));
+ p = ALLOC_CLEAR_ONE(struct my_acl);
if (p != NULL)
{
WCHAR *wn;
@@ -5952,7 +5952,7 @@
WORD attrFlash = ~g_attrCurrent & 0xff;
DWORD dwDummy;
- LPWORD oldattrs = (LPWORD)alloc(Rows * Columns * sizeof(WORD));
+ LPWORD oldattrs = ALLOC_MULT(WORD, Rows * Columns);
if (oldattrs == NULL)
return;
@@ -6003,7 +6003,7 @@
if (unicodebuf == NULL || length > unibuflen)
{
vim_free(unicodebuf);
- unicodebuf = (WCHAR *)lalloc(length * sizeof(WCHAR), FALSE);
+ unicodebuf = LALLOC_MULT(WCHAR, length);
unibuflen = length;
}
MultiByteToWideChar(cp, 0, (LPCSTR)pchBuf, cbToWrite,
@@ -7117,7 +7117,7 @@
return;
/* Remember the buffer numbers for the arguments. */
- fnum_list = (int *)alloc(sizeof(int) * GARGCOUNT);
+ fnum_list = ALLOC_MULT(int, GARGCOUNT);
if (fnum_list == NULL)
return; /* out of memory */
for (i = 0; i < GARGCOUNT; ++i)