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)
vim · Jun 8, 2022 · ebb01bd · ebb01bd
1 parent 68093d3
commit ebb01bd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/src/dosinst.c b/src/dosinst.c
@@ -211,8 +211,8 @@ check_unpack(void)
     {
 	printf("ERROR: Cannot find filetype.vim in \"%s\"\n", installdir);
 	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",
-		VIM_VERSION_NODOT + 3);
+	printf("You must unpack the runtime archive \"%srt.zip\" before installing.\n",
+		VIM_VERSION_NODOT);
 	myexit(1);
     }
 

diff --git a/src/fileio.c b/src/fileio.c
@@ -1631,7 +1631,6 @@ readfile(
 		 * Do the conversion.
 		 */
 		dst = ptr;
-		size = size;
 		while (size > 0)
 		{
 		    found_bad = FALSE;

diff --git a/src/gui_w32.c b/src/gui_w32.c
@@ -4153,7 +4153,8 @@ _OnMouseWheel(HWND hwnd, WPARAM wParam, LPARAM lParam, int horizontal)
 {
     int		button;
     win_T	*wp;
-    int		modifiers, kbd_modifiers;
+    int		modifiers = 0;
+    int		kbd_modifiers;
     int		zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
     POINT	pt;
 
@@ -4213,7 +4214,7 @@ _OnMouseWheel(HWND hwnd, WPARAM wParam, LPARAM lParam, int horizontal)
     pt.y = GET_Y_LPARAM(lParam);
     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

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

diff --git a/src/os_win32.c b/src/os_win32.c
@@ -3495,7 +3495,7 @@ mch_writable(char_u *name)
  * the allocated memory.
  */
     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);
 }
@@ -8379,7 +8379,6 @@ stop_timeout(void)
     const int *
 start_timeout(long msec)
 {
-    UINT interval = (UINT)msec;
     BOOL ret;
 
     timeout_flag = &timeout_flags[flag_idx];

diff --git a/src/version.c b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5069,
 /**/
     5068,
 /**/