thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2019-05-28 23:08:19 +02:00
parent b58a4b938c
commit c799fe206e
77 changed files with 381 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/textprop.c
View File

@@ -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)