Attachment 17637 Details for Bug 6820 – Patch to add ETEST() checks only where needed

[patch] Patch to add ETEST() checks only where needed

etest.patch (text/plain), 1.32 KB, created by Alan Coopersmith on 2008-07-11 09:34:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2008-07-11 09:34:40 UTC

Size: 1.32 KB

patch

obsolete

>#
># Updated but not checked in:
>#   (will commit)
>#
>#	modified: src/XlibInt.c
>#
>#
># Untracked files:
>#   (use "git add" to add to commit)
>#
>#	etest.patch
>diff --git a/src/XlibInt.c b/src/XlibInt.c
>index 3a1f96f..56bacba 100644
>--- a/src/XlibInt.c
>+++ b/src/XlibInt.c
>@@ -135,11 +135,7 @@ #ifdef __UNIXOS2__
> #define ECHECK(err) (errno == err)
> #define ESET(val)
> #else
>-#ifdef ISC
>-#define ECHECK(err) ((errno == err) || ETEST())
>-#else
> #define ECHECK(err) (errno == err)
>-#endif
> #define ESET(val) errno = val
> #endif
> #endif
>@@ -297,7 +293,7 @@ #else
> 	    nfound = Select (dpy->fd + 1, &r_mask, &w_mask, NULL, NULL);
> #endif
> 	    InternalLockDisplay(dpy, cv != NULL);
>-	    if (nfound < 0 && !ECHECK(EINTR))
>+	    if (nfound < 0 && !(ECHECK(EINTR) || ETEST()))
> 		_XIOError(dpy);
> 	} while (nfound <= 0);
> 
>@@ -509,7 +505,7 @@ #else
> 	result = Select(highest_fd + 1, &r_mask, NULL, NULL, NULL);
> #endif
> 	InternalLockDisplay(dpy, dpy->flags & XlibDisplayReply);
>-	if (result == -1 && !ECHECK(EINTR)) _XIOError(dpy);
>+	if (result == -1 && !(ECHECK(EINTR) || ETEST())) _XIOError(dpy);
> 	if (result <= 0)
> 	    continue;
> #ifdef USE_POLL
>@@ -826,7 +822,7 @@ #endif
> 		    if (!pend)
> 			pend = SIZEOF(xReply);
> 		}
>-		else if (result < 0 && !ECHECK(EINTR))
>+		else if (result < 0 && !(ECHECK(EINTR) || ETEST()))
> 		    _XIOError(dpy);
> 	    }
> 	}

Actions: View | Splinter Review

Attachments on bug 6820: 9380 | 17637

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.