View | Details | Raw Unified | Return to bug 10431 | Differences between
and this patch

Collapse All | Expand All

(-)a/dix/registry.c (-1 / +1 lines)
Lines 313-319 dixResetRegistry(void) Link Here
313
	fclose(fh);
313
	fclose(fh);
314
    fh = fopen(FILENAME, "r");
314
    fh = fopen(FILENAME, "r");
315
    if (!fh)
315
    if (!fh)
316
	LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME);
316
	LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME "\n");
317
317
318
    /* Add built-in resources */
318
    /* Add built-in resources */
319
    RegisterResourceName(RT_NONE, "NONE");
319
    RegisterResourceName(RT_NONE, "NONE");
(-)a/hw/xwin/winclipboardthread.c (-1 / +1 lines)
Lines 454-460 winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr) Link Here
454
static int
454
static int
455
winClipboardIOErrorHandler (Display *pDisplay)
455
winClipboardIOErrorHandler (Display *pDisplay)
456
{
456
{
457
  ErrorF ("\nwinClipboardIOErrorHandler!\n\n");
457
  ErrorF ("winClipboardIOErrorHandler!\n\n");
458
458
459
  /* Restart at the main entry point */
459
  /* Restart at the main entry point */
460
  longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);
460
  longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);
(-)a/hw/xwin/winmultiwindowwm.c (-4 / +4 lines)
Lines 938-944 winMultiWindowXMsgProc (void *pArg) Link Here
938
      if (pProcArg->pDisplay == NULL)
938
      if (pProcArg->pDisplay == NULL)
939
	{
939
	{
940
	  ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
940
	  ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
941
		  "sleeping: %d\n\f",
941
		  "sleeping: %d\n",
942
		  iRetries + 1, WIN_CONNECT_DELAY);
942
		  iRetries + 1, WIN_CONNECT_DELAY);
943
	  ++iRetries;
943
	  ++iRetries;
944
	  sleep (WIN_CONNECT_DELAY);
944
	  sleep (WIN_CONNECT_DELAY);
Lines 1301-1307 winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg) Link Here
1301
      if (pWMInfo->pDisplay == NULL)
1301
      if (pWMInfo->pDisplay == NULL)
1302
	{
1302
	{
1303
	  ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
1303
	  ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
1304
		  "sleeping: %d\n\f",
1304
		  "sleeping: %d\n",
1305
		  iRetries + 1, WIN_CONNECT_DELAY);
1305
		  iRetries + 1, WIN_CONNECT_DELAY);
1306
	  ++iRetries;
1306
	  ++iRetries;
1307
	  sleep (WIN_CONNECT_DELAY);
1307
	  sleep (WIN_CONNECT_DELAY);
Lines 1404-1410 winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr) Link Here
1404
static int
1404
static int
1405
winMultiWindowWMIOErrorHandler (Display *pDisplay)
1405
winMultiWindowWMIOErrorHandler (Display *pDisplay)
1406
{
1406
{
1407
  ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n");
1407
  ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");
1408
1408
1409
  if (g_shutdown)
1409
  if (g_shutdown)
1410
    pthread_exit(NULL);
1410
    pthread_exit(NULL);
Lines 1444-1450 winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr) Link Here
1444
static int
1444
static int
1445
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
1445
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
1446
{
1446
{
1447
  ErrorF ("\nwinMultiWindowXMsgProcIOErrorHandler!\n\n");
1447
  ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");
1448
1448
1449
  /* Restart at the main entry point */
1449
  /* Restart at the main entry point */
1450
  longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
1450
  longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
(-)a/hw/xwin/winshadddnl.c (-1 / +1 lines)
Lines 554-560 winFinishCreateWindowsWindowDDNL (WindowPtr pWin) Link Here
554
  int			iWidth, iHeight;
554
  int			iWidth, iHeight;
555
  int			iX, iY;
555
  int			iX, iY;
556
556
557
  winDebug ("\nwinFinishCreateWindowsWindowDDNL!\n\n");
557
  winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");
558
558
559
  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
559
  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
560
  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
560
  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
(-)a/os/log.c (-2 / +27 lines)
Lines 268-274 LogVWrite(int verb, const char *f, va_list args) Link Here
268
	fwrite(tmpBuffer, len, 1, stderr);
268
	fwrite(tmpBuffer, len, 1, stderr);
269
    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
269
    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
270
	if (logFile) {
270
	if (logFile) {
271
	    fwrite(tmpBuffer, len, 1, logFile);
271
            static char tmpBuffer2[1024];
272
            static Bool needTimestamp = TRUE;
273
274
            if (needTimestamp)
275
              {
276
                needTimestamp = FALSE;
277
278
                /* Format the date and time per ISO8601 */
279
                time_t t = time(NULL);
280
                struct tm tm;
281
                localtime_r(&t, &tm);
282
                strftime(tmpBuffer2, sizeof(tmpBuffer2), "%F %T ",  &tm);
283
284
                /* Concatente the string produced by formatting the va_list */
285
                strncat(tmpBuffer2, tmpBuffer, sizeof(tmpBuffer2));
286
              }
287
            else
288
              {
289
                strncpy(tmpBuffer2, tmpBuffer, sizeof(tmpBuffer2));
290
              }
291
            len = strlen(tmpBuffer2);
292
293
            /* If the log message ends with a newline, note that we need to start the next line with a timestamp */
294
            if (tmpBuffer2[len-1] == '\n')
295
              needTimestamp = TRUE;
296
297
	    fwrite(tmpBuffer2, len, 1, logFile);
272
	    if (logFlush) {
298
	    if (logFlush) {
273
		fflush(logFile);
299
		fflush(logFile);
274
#ifndef WIN32
300
#ifndef WIN32
275
- 

Return to bug 10431