BOOL must be YES or NO

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28754 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-09-30 20:12:14 +00:00
parent 1874665069
commit c0f76095d1
2 changed files with 22 additions and 3 deletions

View file

@ -1,3 +1,7 @@
2009-09-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLock.m: Fix BOOL methods to return YES or NO.
2009-09-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source\win32\GSFileHandle.m:

View file

@ -306,7 +306,14 @@ MUNLOCK
timeout.tv_sec = secs;
// Convert fractions of a second to nanoseconds
timeout.tv_nsec = subsecs * 1e9;
return (0 == pthread_cond_timedwait(&_condition, &_mutex, &timeout));
if (0 == pthread_cond_timedwait(&_condition, &_mutex, &timeout))
{
return YES;
}
else
{
return NO;
}
}
@end
@ -373,13 +380,21 @@ MUNLOCK
beforeDate: (NSDate*)limitDate
{
BOOL ret;
[_condition lock];
if (condition_to_meet == _condition_value)
{
return YES;
}
ret = [_condition waitUntilDate: limitDate]
&& (condition_to_meet == _condition_value);
if ([_condition waitUntilDate: limitDate]
&& (condition_to_meet == _condition_value))
{
ret = YES;
}
else
{
ret = NO;
}
[_condition unlock];
return ret;
}