patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Problem: Using "int" for alloc() often results in compiler warnings.
Solution: Use "size_t" and remove type casts. Remove alloc_check(), Vim
only works with 32 bit ints anyway.
diff --git a/src/misc1.c b/src/misc1.c
index 550a727..bb82f09 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2180,7 +2180,7 @@
pend1 = remove_tail(p, pend, (char_u *)"MacOS");
if (pend1 != pend)
{
- pnew = alloc((unsigned)(pend1 - p) + 15);
+ pnew = alloc(pend1 - p + 15);
if (pnew != NULL)
{
STRNCPY(pnew, p, (pend1 - p));
@@ -2341,7 +2341,7 @@
* Putenv does not copy the string, it has to remain
* valid. The allocated memory will never be freed.
*/
- envbuf = alloc((unsigned)(STRLEN(name) + STRLEN(val) + 2));
+ envbuf = alloc(STRLEN(name) + STRLEN(val) + 2);
if (envbuf != NULL)
{
sprintf((char *)envbuf, "%s=%s", name, val);
@@ -3019,7 +3019,7 @@
{
char_u *dest;
- dest = alloc((unsigned)(STRLEN(fname1) + STRLEN(fname2) + 3));
+ dest = alloc(STRLEN(fname1) + STRLEN(fname2) + 3);
if (dest != NULL)
{
STRCPY(dest, fname1);
@@ -3040,7 +3040,7 @@
char_u *dest;
size_t l = STRLEN(str1);
- dest = alloc((unsigned)(l + STRLEN(str2) + 1L));
+ dest = alloc(l + STRLEN(str2) + 1L);
if (dest != NULL)
{
STRCPY(dest, str1);
@@ -3076,7 +3076,7 @@
if (fname == NULL)
return NULL;
- buf = alloc((unsigned)MAXPATHL);
+ buf = alloc(MAXPATHL);
if (buf != NULL)
{
if (vim_FullName(fname, buf, MAXPATHL, force) != FAIL)
@@ -4231,7 +4231,7 @@
if (ga_grow(gap, 1) == FAIL)
return;
- p = alloc((unsigned)(STRLEN(f) + 1 + isdir));
+ p = alloc(STRLEN(f) + 1 + isdir);
if (p == NULL)
return;