Cygwin/X: Tidy up some cosmetic issues in log strings

Tidy up some cosmetic issues in log strings:
- Add missing '\n'
- Fix some strings starting with '\n'
- Remove '\f' from some log strings

These all just look daft in a log with timestamps.

Also clarify log message about screen origin coordinates

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2010-02-26 14:22:57 +00:00
parent 178e830378
commit 9b18f7ac0b
6 changed files with 9 additions and 9 deletions

View File

@ -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");

View File

@ -453,7 +453,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);

View File

@ -944,7 +944,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);
@ -1327,7 +1327,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);
@ -1430,7 +1430,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);
@ -1470,7 +1470,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);

View File

@ -246,7 +246,7 @@ winScreenInit (int index,
dixScreenOrigins[index].x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
dixScreenOrigins[index].y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
ErrorF("Screen %d added at XINERAMA coordinate (%d,%d).\n",
ErrorF("Screen %d added at virtual desktop coordinate (%d,%d).\n",
index, dixScreenOrigins[index].x, dixScreenOrigins[index].y);
#if CYGDEBUG || YES

View File

@ -651,7 +651,7 @@ winShadowUpdateDD (ScreenPtr pScreen,
"pixmap header to point to the new address. If you get "
"this message and "PROJECT_NAME" freezes or crashes "
"after this message then send a problem report and your "
"%s file to " BUILDERADDR, g_pszLogFile);
"%s file to " BUILDERADDR "\n", g_pszLogFile);
/* Location of shadow framebuffer has changed */
pScreenInfo->pfb = pScreenPriv->pddsdShadow->lpSurface;

View File

@ -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);