summaryrefslogtreecommitdiff
path: root/src/term.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-28 23:08:19 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-28 23:08:19 +0200
commitc799fe206e61f2e2c1231bc46cbe4bb354f3da69 (patch)
tree68b3d2a8bb82519e29fc95f317d2ee02b07f95fa /src/term.c
parentb58a4b938c4bc7e0499700859bd7abba9acc5b11 (diff)
downloadvim-git-c799fe206e61f2e2c1231bc46cbe4bb354f3da69.tar.gz
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type castsv8.1.1414
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.
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/term.c b/src/term.c
index e831f8d1f..cd0e7d31e 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4187,8 +4187,7 @@ add_termcode(char_u *name, char_u *string, int flags)
if (tc_len == tc_max_len)
{
tc_max_len += 20;
- new_tc = (struct termcode *)alloc(
- tc_max_len * sizeof(struct termcode));
+ new_tc = ALLOC_MULT(struct termcode, tc_max_len);
if (new_tc == NULL)
{
tc_max_len -= 20;
@@ -6420,7 +6419,7 @@ show_termcodes(void)
if (tc_len == 0) /* no terminal codes (must be GUI) */
return;
- items = (int *)alloc(sizeof(int) * tc_len);
+ items = ALLOC_MULT(int, tc_len);
if (items == NULL)
return;
@@ -7071,8 +7070,7 @@ gui_get_color_cmn(char_u *name)
{
if (!counting)
{
- colornames_table = (struct rgbcolor_table_S *)alloc(
- sizeof(struct rgbcolor_table_S) * size);
+ colornames_table = ALLOC_MULT(struct rgbcolor_table_S, size);
if (colornames_table == NULL)
{
fclose(fd);