From c799fe206e61f2e2c1231bc46cbe4bb354f3da69 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 28 May 2019 23:08:19 +0200 Subject: 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. --- src/vim.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/vim.h') diff --git a/src/vim.h b/src/vim.h index 42a415a6a..378fe5f87 100644 --- a/src/vim.h +++ b/src/vim.h @@ -1546,6 +1546,16 @@ typedef UINT32_TYPEDEF UINT32_T; # define R_OK 4 /* for systems that don't have R_OK in unistd.h */ #endif +// Allocate memory for one type and cast the returned pointer to have the +// compiler check the types. +#define ALLOC_ONE(type) (type *)alloc(sizeof(type)) +#define ALLOC_MULT(type, count) (type *)alloc(sizeof(type) * (count)) +#define ALLOC_CLEAR_ONE(type) (type *)alloc_clear(sizeof(type)) +#define ALLOC_CLEAR_MULT(type, count) (type *)alloc_clear(sizeof(type) * (count)) +#define LALLOC_CLEAR_ONE(type) (type *)lalloc_clear(sizeof(type), FALSE) +#define LALLOC_CLEAR_MULT(type, count) (type *)lalloc_clear(sizeof(type) * (count), FALSE) +#define LALLOC_MULT(type, count) (type *)lalloc(sizeof(type) * (count), FALSE) + /* * defines to avoid typecasts from (char_u *) to (char *) and back * (vim_strchr() and vim_strrchr() are now in alloc.c) -- cgit v1.2.1