Mercurial > vim
diff src/textprop.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 | 0457d49eb2d9 |
children | 2f39b35f7290 |
line wrap: on
line diff
--- a/src/textprop.c +++ b/src/textprop.c @@ -695,7 +695,7 @@ prop_type_set(typval_T *argvars, int add semsg(_("E969: Property type %s already defined"), name); return; } - prop = (proptype_T *)alloc_clear(sizeof(proptype_T) + STRLEN(name)); + prop = alloc_clear(sizeof(proptype_T) + STRLEN(name)); if (prop == NULL) return; STRCPY(prop->pt_name, name); @@ -703,7 +703,7 @@ prop_type_set(typval_T *argvars, int add htp = buf == NULL ? &global_proptypes : &buf->b_proptypes; if (*htp == NULL) { - *htp = (hashtab_T *)alloc(sizeof(hashtab_T)); + *htp = ALLOC_ONE(hashtab_T); if (*htp == NULL) { vim_free(prop); @@ -1177,7 +1177,7 @@ adjust_props_for_join( proplen = get_text_props(curbuf, lnum, &props, FALSE); if (proplen > 0) { - *prop_line = (textprop_T *)alloc(proplen * (int)sizeof(textprop_T)); + *prop_line = ALLOC_MULT(textprop_T, proplen); if (*prop_line != NULL) { for (ri = 0; ri < proplen; ++ri)