gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9912 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2001-05-10 10:15:38 +00:00
parent 4cf87241db
commit 1f7dc67da9
3 changed files with 72 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2001-05-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSConnection.m: Use respondsToSelector rather than respondsTo
* Source/NSRunLoop.m: ditto ... and tidy up categories to avoid
compiler warnings.
2001-05-08 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/gdomap.c: Fixes to last modifications - provided by

6
Source/NSConnection.m
View file

@ -837,7 +837,7 @@ static BOOL multi_threaded = NO;
/* Preferred MacOS-X version, which just allows the returning of BOOL */
del = [parent delegate];
if ([del respondsTo: @selector(connection:shouldMakeNewConnection:)])
if ([del respondsToSelector: @selector(connection:shouldMakeNewConnection:)])
{
if ([del connection: parent shouldMakeNewConnection: self] == NO)
{
@ -847,7 +847,7 @@ static BOOL multi_threaded = NO;
}
}
/* Deprecated OpenStep version, which just allows the returning of BOOL */
if ([del respondsTo: @selector(makeNewConnection:sender:)])
if ([del respondsToSelector: @selector(makeNewConnection:sender:)])
{
if (![del makeNewConnection: self sender: parent])
{
@ -859,7 +859,7 @@ static BOOL multi_threaded = NO;
/* Here is the GNUstep version, which allows the delegate to specify
a substitute. Note: The delegate is responsible for freeing
newConn if it returns something different. */
if ([del respondsTo: @selector(connection:didConnect:)])
if ([del respondsToSelector: @selector(connection:didConnect:)])
self = [del connection: parent didConnect: self];
/* Register ourselves for invalidation notification when the

128
Source/NSRunLoop.m
View file

@ -391,7 +391,6 @@ static NSComparisonResult aSort(GSIArrayItem i0, GSIArrayItem i1)
- (GSRunLoopWatcher*) _getWatcher: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode;
- (NSMutableArray*) _performers;
- (void) _removeWatcher: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode;
@ -501,6 +500,68 @@ static NSComparisonResult aSort(GSIArrayItem i0, GSIArrayItem i1)
}
}
- (GSRunLoopWatcher*) _getWatcher: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode
{
GSIArray watchers;
if (mode == nil)
{
mode = _current_mode;
}
watchers = NSMapGet(_mode_2_watchers, mode);
if (watchers)
{
unsigned i = GSIArrayCount(watchers);
while (i-- > 0)
{
GSRunLoopWatcher *info;
info = GSIArrayItemAtIndex(watchers, i).obj;
if (info->type == type && info->data == data)
{
return info;
}
}
}
return nil;
}
- (void) _removeWatcher: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode
{
GSIArray watchers;
if (mode == nil)
{
mode = _current_mode;
}
watchers = NSMapGet(_mode_2_watchers, mode);
if (watchers)
{
unsigned i = GSIArrayCount(watchers);
while (i-- > 0)
{
GSRunLoopWatcher *info;
info = GSIArrayItemAtIndex(watchers, i).obj;
if (info->type == type && info->data == data)
{
info->_invalidated = YES;
GSIArrayRemoveItemAtIndex(watchers, i);
}
}
}
}
@end
@implementation NSRunLoop(GNUstepExtensions)
@ -949,69 +1010,6 @@ const NSMapTableValueCallBacks ArrayMapValueCallBacks =
return when;
}
- (GSRunLoopWatcher*) _getWatcher: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode
{
GSIArray watchers;
if (mode == nil)
{
mode = _current_mode;
}
watchers = NSMapGet(_mode_2_watchers, mode);
if (watchers)
{
unsigned i = GSIArrayCount(watchers);
while (i-- > 0)
{
GSRunLoopWatcher *info;
info = GSIArrayItemAtIndex(watchers, i).obj;
if (info->type == type && info->data == data)
{
return info;
}
}
}
return nil;
}
- (void) _removeWatcher: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode
{
GSIArray watchers;
if (mode == nil)
{
mode = _current_mode;
}
watchers = NSMapGet(_mode_2_watchers, mode);
if (watchers)
{
unsigned i = GSIArrayCount(watchers);
while (i-- > 0)
{
GSRunLoopWatcher *info;
info = GSIArrayItemAtIndex(watchers, i).obj;
if (info->type == type && info->data == data)
{
info->_invalidated = YES;
GSIArrayRemoveItemAtIndex(watchers, i);
}
}
}
}
/* Listen to input sources.
If LIMIT_DATE is nil, then don't wait; i.e. call select() with 0 timeout */
@ -1158,7 +1156,7 @@ const NSMapTableValueCallBacks ArrayMapValueCallBacks =
int port_fd_count = 128; // xxx #define this constant
int port_fd_array[port_fd_count];
if ([port respondsTo: @selector(getFds:count:)])
if ([port respondsToSelector: @selector(getFds:count:)])
[port getFds: port_fd_array count: &port_fd_count];
if (debug_run_loop)
printf("\tNSRunLoop listening to %d sockets\n",