summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-02-24 21:39:52 -0600
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-02-24 21:39:52 -0600
commit1176a77fc23fce35b675827941d7109133901c21 (patch)
tree76a95490a8de0531f6177ed0b53bbda92b2923bc
parentf7ed9a65afc69b8b66d610d9328da377fd3bfc68 (diff)
Cygwin/X: Tidy up some cosmetic issue in log stringsxserver-cygwin-1.7.99.901-1
- Add a missing '\n' - Fix some strings starting with '\n' - Remove '\f' from some log strings Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-rw-r--r--dix/registry.c2
-rw-r--r--hw/xwin/winclipboardthread.c2
-rw-r--r--hw/xwin/winmultiwindowwm.c8
-rw-r--r--hw/xwin/winshadddnl.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/dix/registry.c b/dix/registry.c
index ec853b37f..1381a3dcd 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -313,7 +313,7 @@ dixResetRegistry(void)
fclose(fh);
fh = fopen(FILENAME, "r");
if (!fh)
- LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME);
+ LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME "\n");
/* Add built-in resources */
RegisterResourceName(RT_NONE, "NONE");
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index c28f2f10f..9788d883b 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -460,7 +460,7 @@ winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int
winClipboardIOErrorHandler (Display *pDisplay)
{
- ErrorF ("\nwinClipboardIOErrorHandler!\n\n");
+ ErrorF ("winClipboardIOErrorHandler!\n\n");
/* Restart at the main entry point */
longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index e2aa1c37b..6c2812c6f 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -952,7 +952,7 @@ winMultiWindowXMsgProc (void *pArg)
if (pProcArg->pDisplay == NULL)
{
ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
- "sleeping: %d\n\f",
+ "sleeping: %d\n",
iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep (WIN_CONNECT_DELAY);
@@ -1331,7 +1331,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
if (pWMInfo->pDisplay == NULL)
{
ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
- "sleeping: %d\n\f",
+ "sleeping: %d\n",
iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep (WIN_CONNECT_DELAY);
@@ -1434,7 +1434,7 @@ winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int
winMultiWindowWMIOErrorHandler (Display *pDisplay)
{
- ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n");
+ ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");
if (g_shutdown)
pthread_exit(NULL);
@@ -1474,7 +1474,7 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
{
- ErrorF ("\nwinMultiWindowXMsgProcIOErrorHandler!\n\n");
+ ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");
/* Restart at the main entry point */
longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index ef5c21469..e78fbd9e6 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -554,7 +554,7 @@ winFinishCreateWindowsWindowDDNL (WindowPtr pWin)
int iWidth, iHeight;
int iX, iY;
- winDebug ("\nwinFinishCreateWindowsWindowDDNL!\n\n");
+ winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");
iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);