@@ -21,53 +21,23 @@ #import "common.h" #import "macros.h" @implementation OFAddressTranslationFailedException -+ (instancetype)exceptionWithSocket: (id)socket -{ - return [[[self alloc] initWithSocket: socket] autorelease]; -} - + (instancetype)exceptionWithHost: (OFString*)host { return [[[self alloc] initWithHost: host] autorelease]; } -+ (instancetype)exceptionWithHost: (OFString*)host - socket: (id)socket -{ - return [[[self alloc] initWithHost: host - socket: socket] autorelease]; -} - -- init -{ - OF_INVALID_INIT_METHOD -} - -- initWithSocket: (id)socket -{ - return [self initWithHost: nil - socket: socket]; -} - -- initWithHost: (OFString*)host -{ - return [self initWithHost: host - socket: nil]; -} - -- initWithHost: (OFString*)host - socket: (id)socket + +- initWithHost: (OFString*)host { self = [super init]; @try { - _host = [host copy]; - _socket = [socket retain]; - _errNo = GET_AT_ERRNO; + _host = [host copy]; + _errNo = GET_AT_ERRNO; } @catch (id e) { [self release]; @throw e; } @@ -75,31 +45,17 @@ } - (void)dealloc { [_host release]; - [_socket release]; [super dealloc]; } - (OFString*)description { - if (_host != nil && _socket != nil) - return [OFString stringWithFormat: - @"The host %@ could not be translated to an address for a " - @"socket of type %@. This means that either the host was " - @"not found, there was a problem with the name server, " - @"there was a problem with your network connection or you " - @"specified an invalid host. " ERRFMT, _host, - [_socket class], AT_ERRPARAM]; - else if (_socket != nil) - return [OFString stringWithFormat: - @"An address could not be translated for a socket of type " - @"%@! " ERRFMT, [_socket class], - AT_ERRPARAM]; - else if (_host != nil) + if (_host != nil) return [OFString stringWithFormat: @"The host %@ could not be translated to an address. This " @"means that either the host was not found, there was a " @"problem with the name server, there was a problem with " @"your network connection or you specified an invalid " @@ -113,19 +69,14 @@ - (OFString*)host { OF_GETTER(_host, true) } -- (id)socket -{ - OF_GETTER(_socket, true) -} - - (int)errNo { #ifdef _WIN32 return of_wsaerr_to_errno(_errNo); #else return _errNo; #endif } @end