Tidy up some pointless output which is always emittedcygwin-patches-for-1.10

Conflicts:

	hw/xwin/winclipboardthread.c
	hw/xwin/winclipboardwrappers.c

8 files changed, 17 insertions, 18 deletions

diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index 4362197b2..98b62a1a7 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -77,8 +77,8 @@ winBlockHandler (int nScreen,
   if (pScreenPriv != NULL && !pScreenPriv->fServerStarted)
     {
       int		iReturn;
-      
-      winDebug ("winBlockHandler - Releasing pmServerStarted\n");
+
+      ErrorF ("winBlockHandler - pthread_mutex_unlock()\n");
 
       /* Flag that modules are to be started */
       pScreenPriv->fServerStarted = TRUE;
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index d74cd03e2..1cbc27a2b 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -61,7 +61,7 @@ extern HWND			g_hwndClipboard;
 Bool
 winInitClipboard (void)
 {
-  ErrorF ("winInitClipboard ()\n");
+  winDebug ("winInitClipboard ()\n");
 
   /* Wrap some internal server functions */
   if (ProcVector[X_SetSelectionOwner] != winProcSetSelectionOwner)
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index fee4e9e9e..a66a4a75d 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -105,7 +105,7 @@ winClipboardProc (void *pvNotUsed)
 
   pthread_cleanup_push(&winClipboardThreadExit, NULL);
 
-  ErrorF ("winClipboardProc - Hello\n");
+  winDebug ("winClipboardProc - Hello\n");
 
   /* Do we have Unicode support? */
   g_fUnicodeSupport = winClipboardDetectUnicodeSupport ();
diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index bdacefba5..0f3dc14ce 100644
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -189,7 +189,7 @@ winProcEstablishConnection (ClientPtr client)
   static int		s_iCallCount = 0;
   static unsigned long	s_ulServerGeneration = 0;
 
-  if (s_iCallCount == 0 || s_iCallCount == CLIP_NUM_CALLS) ErrorF ("winProcEstablishConnection - Hello\n");
+  if (s_iCallCount == 0 || s_iCallCount == CLIP_NUM_CALLS) winDebug ("winProcEstablishConnection - Hello\n");
 
   /* Do nothing if clipboard is not enabled */
   if (!g_fClipboard)
diff --git a/hw/xwin/windisplay.c b/hw/xwin/windisplay.c
index ce111abda..10ac8f220 100644
--- a/hw/xwin/windisplay.c
+++ b/hw/xwin/windisplay.c
@@ -52,5 +52,5 @@ winGetDisplayName(char *szDisplay, unsigned int screen)
       snprintf(szDisplay, 512, "localhost:%s.%d", display, screen);
     }
 
-  ErrorF ("winGetDisplay: DISPLAY=%s\n", szDisplay);
+  winDebug("winGetDisplay: DISPLAY=%s\n", szDisplay);
 }
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index f09e0c557..6b55a7971 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -396,21 +396,20 @@ InitQueue (WMMsgQueuePtr pQueue)
   pQueue->nQueueSize = 0;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize,
-	  QueueSize(pQueue));
+  winDebug ("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
 #endif
 
-  ErrorF ("InitQueue - Calling pthread_mutex_init\n");
+  winDebug ("InitQueue - Calling pthread_mutex_init\n");
 
   /* Create synchronization objects */
   pthread_mutex_init (&pQueue->pmMutex, NULL);
 
-  ErrorF ("InitQueue - pthread_mutex_init returned\n");
-  ErrorF ("InitQueue - Calling pthread_cond_init\n");
+  winDebug ("InitQueue - pthread_mutex_init returned\n");
+  winDebug ("InitQueue - Calling pthread_cond_init\n");
 
   pthread_cond_init (&pQueue->pcNotEmpty, NULL);
 
-  ErrorF ("InitQueue - pthread_cond_init returned\n");
+  winDebug ("InitQueue - pthread_cond_init returned\n");
 
   return TRUE;
 }
@@ -872,7 +871,7 @@ winMultiWindowXMsgProc (void *pArg)
 
   pthread_cleanup_push(&winMultiWindowThreadExit, NULL);
 
-  ErrorF ("winMultiWindowXMsgProc - Hello\n");
+  winDebug ("winMultiWindowXMsgProc - Hello\n");
 
   /* Check that argument pointer is not invalid */
   if (pProcArg == NULL)
@@ -1266,7 +1265,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
   char			pszDisplay[512];
   int			iReturn;
 
-  ErrorF ("winInitMultiWindowWM - Hello\n");
+  winDebug ("winInitMultiWindowWM - Hello\n");
 
   /* Check that argument pointer is not invalid */
   if (pProcArg == NULL)
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 422638463..04e770005 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -154,7 +154,7 @@ winInitializeScreenDefaults(void)
 static void
 winInitializeScreen(int i)
 {
-  winErrorFVerb (2, "winInitializeScreen - %d\n",i);
+  winErrorFVerb (3, "winInitializeScreen - %d\n",i);
 
   /* Initialize default screen values, if needed */
   winInitializeScreenDefaults();
@@ -170,7 +170,7 @@ void
 winInitializeScreens(int maxscreens)
 {
   int i;
-  winErrorFVerb (2, "winInitializeScreens - %i\n", maxscreens);
+  winErrorFVerb (3, "winInitializeScreens - %i\n", maxscreens);
 
   if (maxscreens > g_iNumScreens)
     {
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 691237e6f..3b8d3b546 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -463,7 +463,7 @@ winFinishScreenInitFB (int index,
     if (pScreen->a) { \
         pScreenPriv->a = pScreen->a; \
     } else { \
-        ErrorF("null screen fn " #a "\n"); \
+        winDebug("winScreenInit - null screen fn " #a "\n"); \
         pScreenPriv->a = NULL; \
     }
 
@@ -499,7 +499,7 @@ winFinishScreenInitFB (int index,
     if (pScreen->a) { \
         pScreenPriv->a = pScreen->a; \
     } else { \
-        ErrorF("null screen fn " #a "\n"); \
+        winDebug("null screen fn " #a "\n"); \
         pScreenPriv->a = NULL; \
     }