Mercurial > vim
comparison src/hardcopy.c @ 16825:ce04ebdf26b8 v8.1.1414
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
commit https://github.com/vim/vim/commit/c799fe206e61f2e2c1231bc46cbe4bb354f3da69
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 28 23:08:19 2019 +0200
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.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 28 May 2019 23:15:10 +0200 |
parents | 7ad3fc329e08 |
children | f0f9692d4487 |
comparison
equal
deleted
inserted
replaced
16824:1f6bb29738d2 | 16825:ce04ebdf26b8 |
---|---|
184 char_u *p; | 184 char_u *p; |
185 int idx = 0; /* init for GCC */ | 185 int idx = 0; /* init for GCC */ |
186 int len; | 186 int len; |
187 | 187 |
188 /* Save the old values, so that they can be restored in case of an error. */ | 188 /* Save the old values, so that they can be restored in case of an error. */ |
189 old_opts = (option_table_T *)alloc(sizeof(option_table_T) * table_size); | 189 old_opts = ALLOC_MULT(option_table_T, table_size); |
190 if (old_opts == NULL) | 190 if (old_opts == NULL) |
191 return NULL; | 191 return NULL; |
192 | 192 |
193 for (idx = 0; idx < table_size; ++idx) | 193 for (idx = 0; idx < table_size; ++idx) |
194 { | 194 { |
2234 static int | 2234 static int |
2235 prt_build_cid_fontname(int font, char_u *name, int name_len) | 2235 prt_build_cid_fontname(int font, char_u *name, int name_len) |
2236 { | 2236 { |
2237 char *fontname; | 2237 char *fontname; |
2238 | 2238 |
2239 fontname = (char *)alloc(name_len + 1); | 2239 fontname = alloc(name_len + 1); |
2240 if (fontname == NULL) | 2240 if (fontname == NULL) |
2241 return FALSE; | 2241 return FALSE; |
2242 vim_strncpy((char_u *)fontname, name, name_len); | 2242 vim_strncpy((char_u *)fontname, name, name_len); |
2243 prt_ps_mb_font.ps_fontname[font] = fontname; | 2243 prt_ps_mb_font.ps_fontname[font] = fontname; |
2244 | 2244 |