From 31045e40c9b83e4786ad09f7b59f6a55b122ae82 Mon Sep 17 00:00:00 2001 From: rfm Date: Mon, 31 Aug 2009 07:47:44 +0000 Subject: [PATCH] further tweak description details git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28579 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 2 ++ Source/NSConnection.m | 4 ++-- Source/NSMessagePort.m | 5 +++-- Source/NSSocketPort.m | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c9f9986d..371cfa86b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,9 @@ * Source/NSMessagePort.m: * Source/NSSocketPort.m: + * Source/NSConnection.m: Improve -description to include the registered names (if any) of ports. + Include full port description in connection description. 2009-08-30 David Chisnall diff --git a/Source/NSConnection.m b/Source/NSConnection.m index 4be9b1a80..fd655dba8 100644 --- a/Source/NSConnection.m +++ b/Source/NSConnection.m @@ -800,8 +800,8 @@ static NSLock *cached_proxies_gate = nil; - (NSString*) description { - return [NSString stringWithFormat: @"%@ recv: 0x%x send 0x%x", - [super description], (uintptr_t)[self receivePort], (uintptr_t)[self sendPort]]; + return [NSString stringWithFormat: @"%@ recv: %@ send %@", + [super description], [self receivePort], [self sendPort]]; } /** diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m index 92a82fe8f..4d9204bb9 100644 --- a/Source/NSMessagePort.m +++ b/Source/NSMessagePort.m @@ -1339,8 +1339,9 @@ typedef struct { names = [[NSMessagePortNameServer sharedInstance] namesForPort: self]; desc = [NSString stringWithFormat: - @"NSMessagePort %p %@ with file name %s", - self, ([names count] == 0) ? (id)@"" : (id)names, [name bytes]]; + @"<%s %p %@ with file name %s>", + GSClassNameFromObject(self), self, + ([names count] == 0) ? (id)@"" : (id)names, [name bytes]]; return desc; } diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m index f39bcfa0b..bb69d795e 100644 --- a/Source/NSSocketPort.m +++ b/Source/NSSocketPort.m @@ -1807,8 +1807,9 @@ static Class tcpPortClass; names = [[NSSocketPortNameServer sharedInstance] namesForPort: self]; desc = [NSString stringWithFormat: - @"NSSocketPort %p %@ on IP address: %@, port: %d", - self, (([names count] == 0) ? (id)@"" : (id)names), host, + @"<%s %p %@ on IP %@,%d>", + GSClassNameFromObject(self), self, + (([names count] == 0) ? (id)@"()" : (id)names), host, ((address == nil) ? (id)@"any" : (id)address), portNum]; return desc; }