Warning fixes

5 files changed, 19 insertions, 18 deletions

diff --git a/wndproc.c b/wndproc.c
index f05b936..d78e5bc 100644
--- a/wndproc.c
+++ b/wndproc.c
@@ -57,7 +57,7 @@
  */
 
 static int
-ProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
+ProcessXEventsTimeout(HWND hwnd, Window iWindow, Display * pDisplay,
                       Bool fUseUnicode, int iTimeoutSec)
 {
   int iConnNumber;
@@ -313,6 +313,7 @@ WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
        */
       if (!IsClipboardFormatAvailable(CF_TEXT)
           && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
+        Window iOwnerWindow;
 
         winDebug("WindowProc - WM_DRAWCLIPBOARD - "
                  "Clipboard does not contain CF_TEXT nor "
@@ -357,28 +358,28 @@ WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         winDebug("WindowProc - XSync done.\n");
 
         /* Release PRIMARY selection if owned */
-        iReturn = XGetSelectionOwner(pDisplay, XA_PRIMARY);
-        if (iReturn == iWindow) {
+        iOwnerWindow = XGetSelectionOwner(pDisplay, XA_PRIMARY);
+        if (iOwnerWindow == iWindow) {
           winDebug("WindowProc - WM_DRAWCLIPBOARD - "
                    "PRIMARY selection is owned by us, releasing\n");
           XSetSelectionOwner(pDisplay, XA_PRIMARY, None, CurrentTime);
         }
-        else if (BadWindow == iReturn || BadAtom == iReturn)
+        else if (BadWindow == iOwnerWindow || BadAtom == iOwnerWindow)
           winError("WindowProc - WM_DRAWCLIPBOARD - "
                    "XGetSelectionOwner failed for PRIMARY: %d\n",
-                   iReturn);
+                   iOwnerWindow);
 
         /* Release CLIPBOARD selection if owned */
-        iReturn = XGetSelectionOwner(pDisplay, atomClipboard);
-        if (iReturn == iWindow) {
+        iOwnerWindow = XGetSelectionOwner(pDisplay, atomClipboard);
+        if (iOwnerWindow == iWindow) {
           winDebug("WindowProc - WM_DRAWCLIPBOARD - "
                    "CLIPBOARD selection is owned by us, releasing\n");
           XSetSelectionOwner(pDisplay, atomClipboard, None, CurrentTime);
         }
-        else if (BadWindow == iReturn || BadAtom == iReturn)
+        else if (BadWindow == iOwnerWindow || BadAtom == iOwnerWindow)
           winError("WindowProc - WM_DRAWCLIPBOARD - "
                    "XGetSelectionOwner failed for CLIPBOARD: %d\n",
-                   iReturn);
+                   iOwnerWindow);
 
         winDebug("WindowProc - WM_DRAWCLIPBOARD: Exit\n");
         s_fProcessingDrawClipboard = FALSE;
@@ -540,7 +541,7 @@ WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
  */
 
 WINBOOL
-FlushWindowsMessageQueue(HWND hwnd)
+FlushWindowsMessageQueue(void)
 {
   MSG msg;
 
diff --git a/wndproc.h b/wndproc.h
index 27f968e..73d1042 100644
--- a/wndproc.h
+++ b/wndproc.h
@@ -45,7 +45,7 @@
  */
 
 WINBOOL
-FlushWindowsMessageQueue (HWND hwnd);
+FlushWindowsMessageQueue(void);
 
 LRESULT CALLBACK
 WindowProc (HWND hwnd, UINT message,
diff --git a/xevents.c b/xevents.c
index 850ac3d..3ffaf72 100644
--- a/xevents.c
+++ b/xevents.c
@@ -50,7 +50,7 @@
  */
 
 #define CLIP_NUM_SELECTIONS		2
-#define CLIP_OWN_NONE     		-1
+#define CLIP_OWN_NONE     		((unsigned int)-1)
 #define CLIP_OWN_PRIMARY		0
 #define CLIP_OWN_CLIPBOARD		1
 
@@ -122,14 +122,14 @@ GetLastOwnedSelectionAtom(void)
 int
 FlushXEvents (HWND hwnd, Atom atomLocalProperty, Atom atomUTF8String,
 	      Atom atomCompoundText, Atom atomTargets,
-	      int iWindow, Display *pDisplay,
+	      Window iWindow, Display *pDisplay,
 	      Bool fUseUnicode)
 {
   atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);
 
   /* Process all pending events */
   while (XPending(pDisplay)) {
-    XTextProperty xtpText = { 0 };
+    XTextProperty xtpText = { 0, 0, 0, 0 };
     XEvent event;
     XSelectionEvent eventSelection;
     unsigned long ulReturnBytesLeft;
diff --git a/xevents.h b/xevents.h
index 6a3bcd8..12a2715 100644
--- a/xevents.h
+++ b/xevents.h
@@ -45,7 +45,7 @@
 int
 FlushXEvents (HWND hwnd, Atom atomLocalProperty, Atom atomUTF8String,
 	      Atom atomCompoundText, Atom atomTargets,
-	      int iWindow, Display *pDisplay,
+	      Window iWindow, Display *pDisplay,
 	      Bool fUseUnicode);
 
 Atom
diff --git a/xwinclip.c b/xwinclip.c
index 5593cf8..8adb813 100644
--- a/xwinclip.c
+++ b/xwinclip.c
@@ -307,7 +307,7 @@ ClipboardProc(Bool fUnicodeSupport, char *pszDisplay)
 		fUnicodeSupport);
 
   /* Pre-flush Windows messages */
-  if (!FlushWindowsMessageQueue (hwnd))
+  if (!FlushWindowsMessageQueue())
     {
       winError("ClipboardFlushWindowsMessageQueue failed\n");
       goto ClipboardProc_Done;
@@ -392,7 +392,7 @@ ClipboardProc(Bool fUnicodeSupport, char *pszDisplay)
             winDebug ("/dev/windows ready, pumping Windows message queue\n");
 
             /* Process Windows messages */
-            if (!FlushWindowsMessageQueue (hwnd))
+            if (!FlushWindowsMessageQueue())
               {
                 winError("FlushWindowsMessageQueue trapped WM_QUIT message, exiting main loop.\n");
                 break;
@@ -416,7 +416,7 @@ ClipboardProc_Done:
     /* Destroy the Window window (hwnd) */
     winDebug("Destroy Windows window\n");
     PostMessage(hwnd, WM_DESTROY, 0, 0);
-    FlushWindowsMessageQueue(hwnd);
+    FlushWindowsMessageQueue();
   }
 
   /* Close our X window */