Merge pull request #32 from dgrove-oss/sem_timedwait_bugfix

MadCoder · MadCoder · commit 3ce4e3d1b27c · 2016-01-08T13:57:20.000-08:00
Bug fix in testing of return code of sem_timedwait
diff --git a/src/semaphore.c b/src/semaphore.c
@@ -348,7 +348,7 @@ _dispatch_semaphore_wait_slow(dispatch_semaphore_t dsema,
 			ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout));
 		} while (ret == -1 && errno == EINTR);
 
-		if (ret == -1 && errno != ETIMEDOUT) {
+		if (!(ret == -1 && errno == ETIMEDOUT)) {
 			DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 			break;
 		}

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ _dispatch_semaphore_wait_slow(dispatch_semaphore_t dsema,`
`348`	`348`	`ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout));`
`349`	`349`	`} while (ret == -1 && errno == EINTR);`
`350`	`350`
`351`		`- if (ret == -1 && errno != ETIMEDOUT) {`
	`351`	`+ if (!(ret == -1 && errno == ETIMEDOUT)) {`
`352`	`352`	`DISPATCH_SEMAPHORE_VERIFY_RET(ret);`
`353`	`353`	`break;`
`354`	`354`	`}`