gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-26 10:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5516 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-12-15 08:51:16 +00:00
parent 561f598af2
commit 28aa5bc7d9
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Source/NSHost.m
View file

@ -1,27 +1,27 @@
/* Implementation of host class /* Implementation of host class
Copyright (C) 1996, 1997,1999 Free Software Foundation, Inc. Copyright (C) 1996, 1997,1999 Free Software Foundation, Inc.
Written by: Luke Howard <lukeh@xedoc.com.au> Written by: Luke Howard <lukeh@xedoc.com.au>
Date: 1996 Date: 1996
Rewrite by: Richard Frith-Macdonald <richard@brainstorm.co.uk> Rewrite by: Richard Frith-Macdonald <richard@brainstorm.co.uk>
Date: 1999 Date: 1999
This file is part of the GNUstep Base Library. This file is part of the GNUstep Base Library.
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version. version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/ */
#include <config.h> #include <config.h>
#include <base/preface.h> #include <base/preface.h>
@ -97,7 +97,6 @@ static NSMutableDictionary *_hostCache = nil;
[_addresses addObject: addr]; [_addresses addObject: addr];
} }
[_hostCacheLock lock];
if (_hostCacheEnabled == YES) if (_hostCacheEnabled == YES)
{ {
NSEnumerator *enumerator; NSEnumerator *enumerator;
@ -114,8 +113,7 @@ static NSMutableDictionary *_hostCache = nil;
[_hostCache setObject: self forKey: key]; [_hostCache setObject: self forKey: key];
} }
} }
[_hostCacheLock unlock];
return self; return self;
} }
@ -133,7 +131,7 @@ static NSMutableDictionary *_hostCache = nil;
{ {
if (self == [NSHost class]) if (self == [NSHost class])
{ {
_hostCacheLock = [[NSRecursiveLock alloc] init]; _hostCacheLock = [[NSLock alloc] init];
_hostCache = [NSMutableDictionary new]; _hostCache = [NSMutableDictionary new];
} }
} }
@ -147,7 +145,7 @@ static NSMutableDictionary *_hostCache = nil;
{ {
char name[GSMAXHOSTNAMELEN+1]; char name[GSMAXHOSTNAMELEN+1];
int res; int res;
res = gethostname(name, GSMAXHOSTNAMELEN); res = gethostname(name, GSMAXHOSTNAMELEN);
if (res < 0) if (res < 0)
{ {
@ -177,7 +175,7 @@ static NSMutableDictionary *_hostCache = nil;
struct hostent *h; struct hostent *h;
h = gethostbyname((char*)[name cString]); h = gethostbyname((char*)[name cString]);
host = [[self alloc] _initWithHostEntry: h]; host = [[self alloc] _initWithHostEntry: h];
AUTORELEASE(host); AUTORELEASE(host);
} }
@ -206,7 +204,7 @@ static NSMutableDictionary *_hostCache = nil;
struct hostent *h; struct hostent *h;
struct in_addr hostaddr; struct in_addr hostaddr;
BOOL addrOk = YES; BOOL addrOk = YES;
#ifndef HAVE_INET_ATON #ifndef HAVE_INET_ATON
hostaddr.s_addr = inet_addr([address cString]); hostaddr.s_addr = inet_addr([address cString]);
if (hostaddr.s_addr == INADDR_NONE) if (hostaddr.s_addr == INADDR_NONE)
@ -240,11 +238,11 @@ static NSMutableDictionary *_hostCache = nil;
+ (BOOL) isHostCacheEnabled; + (BOOL) isHostCacheEnabled;
{ {
BOOL res; BOOL res;
[_hostCacheLock lock]; [_hostCacheLock lock];
res = _hostCacheEnabled; res = _hostCacheEnabled;
[_hostCacheLock unlock]; [_hostCacheLock unlock];
return res; return res;
} }