diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-28 23:08:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-28 23:08:19 +0200 |
| commit | c799fe206e61f2e2c1231bc46cbe4bb354f3da69 (patch) | |
| tree | 68b3d2a8bb82519e29fc95f317d2ee02b07f95fa /src/textprop.c | |
| parent | b58a4b938c4bc7e0499700859bd7abba9acc5b11 (diff) | |
| download | vim-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/textprop.c')
| -rw-r--r-- | src/textprop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/textprop.c b/src/textprop.c index 8ad795ac0..2d7567cdb 100644 --- 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) |