summaryrefslogtreecommitdiff
path: root/src/os_mswin.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-28 23:08:19 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-28 23:08:19 +0200
commitc799fe206e61f2e2c1231bc46cbe4bb354f3da69 (patch)
tree68b3d2a8bb82519e29fc95f317d2ee02b07f95fa /src/os_mswin.c
parentb58a4b938c4bc7e0499700859bd7abba9acc5b11 (diff)
downloadvim-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/os_mswin.c')
-rw-r--r--src/os_mswin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 6f3e708db..869c9a002 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1801,7 +1801,7 @@ resolve_reparse_point(char_u *fname)
goto fail;
size = sizeof(FILE_NAME_INFO_) + sizeof(WCHAR) * (MAX_PATH - 1);
- nameinfo = (FILE_NAME_INFO_*)alloc(size + sizeof(WCHAR));
+ nameinfo = alloc(size + sizeof(WCHAR));
if (nameinfo == NULL)
goto fail;
@@ -1835,7 +1835,7 @@ resolve_reparse_point(char_u *fname)
GetLastError() != ERROR_MORE_DATA)
goto fail;
- volnames = (WCHAR*)alloc(size * sizeof(WCHAR));
+ volnames = ALLOC_MULT(WCHAR, size);
if (!GetVolumePathNamesForVolumeNameW(buff, volnames, size,
&size))
goto fail;
@@ -3078,7 +3078,7 @@ theend:
if (ret == OK && printer_dc == NULL)
{
vim_free(lastlf);
- lastlf = (LOGFONTW *)alloc(sizeof(LOGFONTW));
+ lastlf = ALLOC_ONE(LOGFONTW);
if (lastlf != NULL)
mch_memmove(lastlf, lf, sizeof(LOGFONTW));
}