From 4a38c3bda2b0a868d7611f9423d8a0f304b435aa Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Tue, 18 Jun 2013 19:18:08 +0100 Subject: [PATCH] hw/xwin: Remove XOpenDisplay() retry code Remove XOpenDisplay() retry code. This isn't a sensible thing for the application to be doing, and XWin server needs to retry much more than just XOpenDisplay(). Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winclipboard/thread.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/hw/xwin/winclipboard/thread.c b/hw/xwin/winclipboard/thread.c index 53e28c47a..31986f6a0 100644 --- a/hw/xwin/winclipboard/thread.c +++ b/hw/xwin/winclipboard/thread.c @@ -111,7 +111,6 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay) int iMaxDescriptor; Display *pDisplay = NULL; Window iWindow = None; - int iRetries; int iSelectError; Bool fShutdown = FALSE; @@ -140,26 +139,8 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay) goto winClipboardProc_Done; } - /* Initialize retry count */ - iRetries = 0; - - - /* Open the X display */ - do { - pDisplay = XOpenDisplay(szDisplay); - if (pDisplay == NULL) { - ErrorF("winClipboardProc - Could not open display, " - "try: %d, sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY); - ++iRetries; - sleep(WIN_CONNECT_DELAY); - continue; - } - else - break; - } - while (pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES); - /* Make sure that the display opened */ + pDisplay = XOpenDisplay(szDisplay); if (pDisplay == NULL) { ErrorF("winClipboardProc - Failed opening the display, giving up\n"); goto winClipboardProc_Done;