From 0bd8528d2a29c3eedab465953390b3dcbdbb1a90 Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 4 Jul 2000 09:49:31 +0000
Subject: [PATCH] Tidied

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6867 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                               | 1 +
 Headers/gnustep/base/NSPortNameServer.h | 2 +-
 Source/GSConnection.m                   | 4 ++--
 Source/NSConnection.m                   | 2 +-
 Source/NSPort.m                         | 2 +-
 Source/NSPortNameServer.m               | 2 +-
 Source/TcpPort.m                        | 8 ++++----
 Testing/gstcpport-client.m              | 2 +-
 Testing/gstcpport-server.m              | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b05394f0..8bb1c87cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	* Source/NSArchiver.m: minor tidyup
 	* Source/NSDistantObject.m: minor performance tweak
 	* Source/NSUnarchiver.m: minor tidyup.
+	* Source/NSPortNameServer.m: Update for MacOS-X
 
 2000-07-03  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Headers/gnustep/base/NSPortNameServer.h b/Headers/gnustep/base/NSPortNameServer.h
index b589962bf..a3a46f182 100644
--- a/Headers/gnustep/base/NSPortNameServer.h
+++ b/Headers/gnustep/base/NSPortNameServer.h
@@ -33,7 +33,7 @@
   NSMapTable	*_portMap;	/* Registered ports information.	*/
   NSMapTable	*_nameMap;	/* Registered names information.	*/
 }
-+ (id) defaultPortNameServer;
++ (id) systemDefaultPortNameServer;
 - (NSPort*) portForName: (NSString*)name;
 - (NSPort*) portForName: (NSString*)name
 		 onHost: (NSString*)host;
diff --git a/Source/GSConnection.m b/Source/GSConnection.m
index bbe5f0ba6..e78cbf8cf 100644
--- a/Source/GSConnection.m
+++ b/Source/GSConnection.m
@@ -337,7 +337,7 @@ static NSLock		*global_proxies_gate;
 {
   NSPortNameServer	*s;
 
-  s = [NSPortNameServer defaultPortNameServer];
+  s = [NSPortNameServer systemDefaultPortNameServer];
   return [self connectionWithRegisteredName: n
 				       host: h
 			    usingNameServer: s];
@@ -891,7 +891,7 @@ static NSLock		*global_proxies_gate;
 
 - (BOOL) registerName: (NSString*)name
 {
-  NSPortNameServer	*svr = [NSPortNameServer defaultPortNameServer];
+  NSPortNameServer	*svr = [NSPortNameServer systemDefaultPortNameServer];
 
   return [self registerName: name withNameServer: svr];
 }
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index d2308bea4..db03c17b6 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -509,7 +509,7 @@ static int messages_received_count;
 
 - (BOOL) registerName: (NSString*)name
 {
-  NSPortNameServer	*svr = [NSPortNameServer defaultPortNameServer];
+  NSPortNameServer	*svr = [NSPortNameServer systemDefaultPortNameServer];
   NSArray		*names = [svr namesForPort: receive_port];
   BOOL			result = YES;
 
diff --git a/Source/NSPort.m b/Source/NSPort.m
index 24c275301..34639ace4 100644
--- a/Source/NSPort.m
+++ b/Source/NSPort.m
@@ -110,7 +110,7 @@ Class	_concreteClass;
  */
 - (void) invalidate
 {
-  [[NSPortNameServer defaultPortNameServer] removePort: self];
+  [[NSPortNameServer systemDefaultPortNameServer] removePort: self];
   _is_valid = NO;
   [[NSNotificationCenter defaultCenter]
     postNotificationName: NSPortDidBecomeInvalidNotification
diff --git a/Source/NSPortNameServer.m b/Source/NSPortNameServer.m
index f40333a12..ed604ec6a 100644
--- a/Source/NSPortNameServer.m
+++ b/Source/NSPortNameServer.m
@@ -522,7 +522,7 @@ typedef enum {
     }
 }
 
-+ (id) defaultPortNameServer
++ (id) systemDefaultPortNameServer
 {
   if (defaultServer == nil)
     {
diff --git a/Source/TcpPort.m b/Source/TcpPort.m
index 2799037b5..71446edc2 100644
--- a/Source/TcpPort.m
+++ b/Source/TcpPort.m
@@ -550,8 +550,8 @@ static NSMapTable* port_number_2_port;
   TcpInPort*		p = [self newForReceivingFromPortNumber: portn];
 
   if (p) {
-    [[NSPortNameServer defaultPortNameServer] registerPort: p
-						   forName: name];
+    [[NSPortNameServer systemDefaultPortNameServer] registerPort: p
+							 forName: name];
   }
   return p;
 }
@@ -1225,8 +1225,8 @@ static NSMapTable *out_port_bag = NULL;
 {
   id	c;
 
-  c = [[NSPortNameServer defaultPortNameServer] portForName: name
-						     onHost: hostname];
+  c = [[NSPortNameServer systemDefaultPortNameServer] portForName: name
+							   onHost: hostname];
   return [c retain];
 }
 
diff --git a/Testing/gstcpport-client.m b/Testing/gstcpport-client.m
index 8770aaf6e..4fbf794c6 100644
--- a/Testing/gstcpport-client.m
+++ b/Testing/gstcpport-client.m
@@ -22,7 +22,7 @@ main()
   local = [GSTcpPort new];
   loop = [NSRunLoop currentRunLoop];
   [NSPortNameServer setPortClass: [GSTcpPort class]];
-  names = [NSPortNameServer defaultPortNameServer];
+  names = [NSPortNameServer systemDefaultPortNameServer];
   remote = [names portForName: @"GSTcpPort"];
   [loop addPort: (NSPort*)local forMode: NSDefaultRunLoopMode];
   [remote sendBeforeDate: [NSDate dateWithTimeIntervalSinceNow: 240]
diff --git a/Testing/gstcpport-server.m b/Testing/gstcpport-server.m
index 2778f14f1..20b0c579a 100644
--- a/Testing/gstcpport-server.m
+++ b/Testing/gstcpport-server.m
@@ -35,7 +35,7 @@ main()
   [local setDelegate: del];
   loop = [NSRunLoop currentRunLoop];
   [NSPortNameServer setPortClass: [GSTcpPort class]];
-  names = [NSPortNameServer defaultPortNameServer];
+  names = [NSPortNameServer systemDefaultPortNameServer];
   [names registerPort: (NSPort*)local forName: @"GSTcpPort"];
   [loop addPort: (NSPort*)local forMode: NSDefaultRunLoopMode];
   [loop run];