summaryrefslogtreecommitdiff
path: root/src/gui_w32.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-24 18:54:09 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-24 18:54:09 +0200
commit964b3746b9c81e65887e2ac9a335f181db2bb592 (patch)
tree9afaaac41a1c4f71b359fd6706b88df00e22e7a1 /src/gui_w32.c
parentd33a764123a8aedb20cd84aeff3b94810ee67c4c (diff)
downloadvim-git-964b3746b9c81e65887e2ac9a335f181db2bb592.tar.gz
patch 8.1.1384: using "int" for alloc() often results in compiler warningsv8.1.1384
Problem: Using "int" for alloc() often results in compiler warnings. Solution: Use "size_t" and remove type casts. Remove alloc_check(), Vim only works with 32 bit ints anyway.
Diffstat (limited to 'src/gui_w32.c')
-rw-r--r--src/gui_w32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 596183073..bf2738606 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3120,9 +3120,9 @@ logfont2name(LOGFONTW lf)
charset_name = charset_id2name((int)lf.lfCharSet);
quality_name = quality_id2name((int)lf.lfQuality);
- res = (char *)alloc((unsigned)(strlen(font_name) + 30
+ res = (char *)alloc(strlen(font_name) + 30
+ (charset_name == NULL ? 0 : strlen(charset_name) + 2)
- + (quality_name == NULL ? 0 : strlen(quality_name) + 2)));
+ + (quality_name == NULL ? 0 : strlen(quality_name) + 2));
if (res != NULL)
{
p = res;
@@ -7718,7 +7718,7 @@ gui_mch_tearoff(
}
/* Allocate menu label and fill it in */
- text = label = alloc((unsigned)len + 1);
+ text = label = alloc(len + 1);
if (label == NULL)
break;