Misc minor warning removals

mbert · Jul 4, 2021 · 32ea960 · 32ea960
1 parent d2e9ce2
commit 32ea960
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/guiwin32/guiwin.c b/guiwin32/guiwin.c
@@ -285,7 +285,6 @@ static int gwinit (int argc, char *argv[])
 static void gwloop (void)
 {
 	MSG             msg;
-	GUI_WINDOW      *gwp;
 
 	/* the default window options aren't editable once we have real windows */
 	optdelete((OPTVAL *)&gw_def_win.options);
@@ -562,7 +561,7 @@ static void gwdraw(GUIWIN *gw, long fg, long bg, int bits, Char *text, int len)
 	register int    i;
 	GUI_WINDOW      *gwp = (GUI_WINDOW *)gw;
 	COLORREF        fgc, bgc;
-	HBRUSH          hBrush, hPrevBrush;
+	HBRUSH          hBrush;
 	HPEN            hPen, hPrevPen;
 	HDC             hDC;
 	HFONT           hFont;

diff --git a/guiwin32/gwdlgs.c b/guiwin32/gwdlgs.c
@@ -428,7 +428,7 @@ static void OptGuiHelper(HWND hwnd, CINFO *old, CINFO *new)
 	SendDlgItemMessage (hwnd, IDC_GUI_FIXED, BM_SETCHECK,
 			(new->bits & (COLOR_PROP|COLOR_PROPSET)) == COLOR_PROPSET ? BST_CHECKED : BST_UNCHECKED, 0);
 	SendDlgItemMessage (hwnd, IDC_GUI_PROPORTIONAL, BM_SETCHECK,
-			(new->bits & (COLOR_PROP|COLOR_PROPSET) == (COLOR_PROP|COLOR_PROPSET)) ? BST_CHECKED : BST_UNCHECKED, 0);
+			((new->bits & (COLOR_PROP|COLOR_PROPSET)) == (COLOR_PROP|COLOR_PROPSET)) ? BST_CHECKED : BST_UNCHECKED, 0);
 
 	/* set combo box colors for new text type */
 	SendDlgItemMessage (hwnd, IDC_GUI_FOREGROUND, WM_SETTEXT,

diff --git a/guiwin32/gwmsg.c b/guiwin32/gwmsg.c
@@ -595,7 +595,7 @@ LRESULT gwclient_WM_PAINT (GUI_WINDOW *gwp, WPARAM wParam, LPARAM lParam)
 
 {
 	PAINTSTRUCT ps;
-	HBRUSH      brush, prevbrush;
+	HBRUSH      brush;
 	int         left;
 	int         top;
 

diff --git a/guiwin32/gwtoolb.c b/guiwin32/gwtoolb.c
@@ -143,7 +143,7 @@ void gw_toolbar_tooltip (GUI_WINDOW *gwp, LPARAM lParam)
 
     lptext = (LPTOOLTIPTEXT)lParam;
     if (lptext->hdr.code == TTN_NEEDTEXT) {
-        LoadString (hInst, lptext->hdr.idFrom, buffer, sizeof (buffer));
+        LoadString (hInst, (UINT)lptext->hdr.idFrom, buffer, sizeof (buffer));
         if ((p = strchr (buffer, '\n')) != NULL)
             p++;
         lptext->lpszText = p;

diff --git a/oswin32/osdir.c b/oswin32/osdir.c
@@ -574,13 +574,13 @@ void osinit(argv0)
  static	char	path[260];
 	char    modulep[MAX_PATH];
 	int	i, j;
-	DWORD	dw, dw2;
-	FILETIME when;
 	struct mtab_s swapper;
 #if NEW_CYGWIN
 	ELVBOOL oldhide;
 	CHAR	ch, line[200];
 #else
+	DWORD	dw, dw2;
+	FILETIME when;
 	char	name[200];
 	char	value[200];
 	HKEY	hCygnus, hMounts, hKey;