Mercurial > vim
diff src/insexpand.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 | 695d9ef00b03 |
| children | 77c3f6428b6c |
line wrap: on
line diff
--- a/src/insexpand.c +++ b/src/insexpand.c @@ -473,7 +473,7 @@ ins_compl_add_infercase( ? actual_len : actual_compl_length; // Allocate wide character array for the completion and fill it. - wca = (int *)alloc(actual_len * sizeof(int)); + wca = ALLOC_MULT(int, actual_len); if (wca != NULL) { p = str; @@ -611,7 +611,7 @@ ins_compl_add( // Allocate a new match structure. // Copy the values to the new match structure. - match = (compl_T *)alloc_clear(sizeof(compl_T)); + match = ALLOC_CLEAR_ONE(compl_T); if (match == NULL) return FAIL; match->cp_number = -1; @@ -1070,8 +1070,7 @@ ins_compl_show_pum(void) } while (compl != NULL && compl != compl_first_match); if (compl_match_arraysize == 0) return; - compl_match_array = (pumitem_T *)alloc_clear( - sizeof(pumitem_T) * compl_match_arraysize); + compl_match_array = ALLOC_CLEAR_MULT(pumitem_T, compl_match_arraysize); if (compl_match_array != NULL) { // If the current match is the original text don't find the first