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/memline.c b/src/memline.c
index 8416257..5ae99df 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1189,7 +1189,7 @@
* Allocate a buffer structure for the swap file that is used for recovery.
* Only the memline and crypt information in it are really used.
*/
- buf = (buf_T *)alloc(sizeof(buf_T));
+ buf = ALLOC_ONE(buf_T);
if (buf == NULL)
goto theend;
@@ -1911,9 +1911,9 @@
);
if (swapname != NULL)
{
- if (mch_stat((char *)swapname, &st) != -1) /* It exists! */
+ if (mch_stat((char *)swapname, &st) != -1) // It exists!
{
- files = (char_u **)alloc(sizeof(char_u *));
+ files = ALLOC_ONE(char_u *);
if (files != NULL)
{
files[0] = swapname;
@@ -4205,8 +4205,7 @@
{
CHECK(top > 0, _("Stack size increases")); /* more than 5 levels??? */
- newstack = (infoptr_T *)alloc(sizeof(infoptr_T) *
- (buf->b_ml.ml_stack_size + STACK_INCR));
+ newstack = ALLOC_MULT(infoptr_T, buf->b_ml.ml_stack_size + STACK_INCR);
if (newstack == NULL)
return -1;
if (top > 0)
@@ -5235,7 +5234,7 @@
if (state == NULL)
return data;
- new_data = (char_u *)alloc(size);
+ new_data = alloc(size);
if (new_data == NULL)
return NULL;
head_end = (char_u *)(&dp->db_index[dp->db_line_count]);
@@ -5375,8 +5374,7 @@
return;
if (buf->b_ml.ml_chunksize == NULL)
{
- buf->b_ml.ml_chunksize =
- (chunksize_T *)alloc(sizeof(chunksize_T) * 100);
+ buf->b_ml.ml_chunksize = ALLOC_MULT(chunksize_T, 100);
if (buf->b_ml.ml_chunksize == NULL)
{
buf->b_ml.ml_usedchunks = -1;