0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.2.5069: various warnings from clang on MS-Windows

Problem:    Various warnings from clang on MS-Windows.
Solution:   Fix the code to avoid the warnings. (Yegappan Lakshmanan,
            closes #10538)
This commit is contained in:
Yegappan Lakshmanan 2022-06-08 15:14:09 +01:00 committed by Bram Moolenaar
parent 68093d36bf
commit ebb01bdb27
6 changed files with 9 additions and 8 deletions

View File

@ -211,8 +211,8 @@ check_unpack(void)
{ {
printf("ERROR: Cannot find filetype.vim in \"%s\"\n", installdir); printf("ERROR: Cannot find filetype.vim in \"%s\"\n", installdir);
printf("It looks like you did not unpack the runtime archive.\n"); printf("It looks like you did not unpack the runtime archive.\n");
printf("You must unpack the runtime archive \"vim%srt.zip\" before installing.\n", printf("You must unpack the runtime archive \"%srt.zip\" before installing.\n",
VIM_VERSION_NODOT + 3); VIM_VERSION_NODOT);
myexit(1); myexit(1);
} }

View File

@ -1631,7 +1631,6 @@ retry:
* Do the conversion. * Do the conversion.
*/ */
dst = ptr; dst = ptr;
size = size;
while (size > 0) while (size > 0)
{ {
found_bad = FALSE; found_bad = FALSE;

View File

@ -4153,7 +4153,8 @@ _OnMouseWheel(HWND hwnd, WPARAM wParam, LPARAM lParam, int horizontal)
{ {
int button; int button;
win_T *wp; win_T *wp;
int modifiers, kbd_modifiers; int modifiers = 0;
int kbd_modifiers;
int zDelta = GET_WHEEL_DELTA_WPARAM(wParam); int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
POINT pt; POINT pt;
@ -4213,7 +4214,7 @@ _OnMouseWheel(HWND hwnd, WPARAM wParam, LPARAM lParam, int horizontal)
pt.y = GET_Y_LPARAM(lParam); pt.y = GET_Y_LPARAM(lParam);
ScreenToClient(s_textArea, &pt); ScreenToClient(s_textArea, &pt);
gui_send_mouse_event(button, pt.x, pt.y, FALSE, kbd_modifiers); gui_send_mouse_event(button, pt.x, pt.y, FALSE, modifiers);
} }
#ifdef USE_SYSMENU_FONT #ifdef USE_SYSMENU_FONT

View File

@ -560,7 +560,7 @@ resolve_appexeclink(char_u *fname)
&& idx < (int)rb->AppExecLinkReparseBuffer.StringCount && idx < (int)rb->AppExecLinkReparseBuffer.StringCount
&& idx != 2; ) && idx != 2; )
{ {
if ((*p++ == L'\0')) if (*p++ == L'\0')
++idx; ++idx;
} }

View File

@ -3495,7 +3495,7 @@ mch_writable(char_u *name)
* the allocated memory. * the allocated memory.
*/ */
int int
mch_can_exe(char_u *name, char_u **path, int use_path) mch_can_exe(char_u *name, char_u **path, int use_path UNUSED)
{ {
return executable_exists((char *)name, path, TRUE, TRUE); return executable_exists((char *)name, path, TRUE, TRUE);
} }
@ -8379,7 +8379,6 @@ stop_timeout(void)
const int * const int *
start_timeout(long msec) start_timeout(long msec)
{ {
UINT interval = (UINT)msec;
BOOL ret; BOOL ret;
timeout_flag = &timeout_flags[flag_idx]; timeout_flag = &timeout_flags[flag_idx];

View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5069,
/**/ /**/
5068, 5068,
/**/ /**/