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

patch 8.1.1384: using "int" for alloc() often results in compiler warnings

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2019-05-24 18:54:09 +02:00
parent d33a764123
commit 964b3746b9
63 changed files with 293 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/winclip.c
View File

@@ -169,7 +169,7 @@ WideCharToMultiByte_alloc(UINT cp, DWORD flags,
{
*outlen = WideCharToMultiByte(cp, flags, in, inlen, NULL, 0, def, useddef);
/* Add one one byte to avoid a zero-length alloc(). */
*out = (LPSTR)alloc((unsigned)*outlen + 1);
*out = (LPSTR)alloc(*outlen + 1);
if (*out != NULL)
{
WideCharToMultiByte(cp, flags, in, inlen, *out, *outlen, def, useddef);
@@ -512,8 +512,7 @@ clip_mch_set_selection(VimClipboard *cbd)
metadata.txtlen = WideCharToMultiByte(GetACP(), 0, out, len,
NULL, 0, 0, 0);
vim_free(str);
str = (char_u *)alloc((unsigned)(metadata.txtlen == 0 ? 1
: metadata.txtlen));
str = (char_u *)alloc(metadata.txtlen == 0 ? 1 : metadata.txtlen);
if (str == NULL)
{
vim_free(out);
@@ -655,7 +654,7 @@ enc_to_utf16(char_u *str, int *lenp)
convert_setup(&conv, NULL, NULL);
length = utf8_to_utf16(str, *lenp, NULL, NULL);
ret = (WCHAR *)alloc((unsigned)((length + 1) * sizeof(WCHAR)));
ret = (WCHAR *)alloc((length + 1) * sizeof(WCHAR));
if (ret != NULL)
{
utf8_to_utf16(str, *lenp, (short_u *)ret, NULL);