Adjust to recent ObjFW changes.

FossilOrigin-Name: e398c849f23f68c426b4172cdfde8ff21469414133abf4e87c12b3a143626096
This commit is contained in:
Jonathan Schleifer 2011-09-22 23:39:01 +00:00
parent 8057b5df61
commit 02dcf41c2c
2 changed files with 6 additions and 5 deletions

View file

@ -173,7 +173,6 @@
@try { @try {
line = [sock tryReadLine]; line = [sock tryReadLine];
} @catch (OFInvalidEncodingException *e) { } @catch (OFInvalidEncodingException *e) {
[e dealloc];
line = [sock tryReadLineWithEncoding: line = [sock tryReadLineWithEncoding:
OF_STRING_ENCODING_WINDOWS_1252]; OF_STRING_ENCODING_WINDOWS_1252];
} }

View file

@ -48,17 +48,19 @@
if ((tmp2 = strdup([string UTF8String])) == NULL) if ((tmp2 = strdup([string UTF8String])) == NULL)
@throw [OFOutOfMemoryException @throw [OFOutOfMemoryException
newWithClass: isa exceptionWithClass: isa
requestedSize: [string UTF8StringLength]]; requestedSize: [string UTF8StringLength]];
if ((tmp = strchr(tmp2, '@')) == NULL) if ((tmp = strchr(tmp2, '@')) == NULL)
@throw [OFInvalidFormatException newWithClass: isa]; @throw [OFInvalidFormatException
exceptionWithClass: isa];
*tmp = '\0'; *tmp = '\0';
hostname = [[OFString alloc] initWithUTF8String: tmp + 1]; hostname = [[OFString alloc] initWithUTF8String: tmp + 1];
if ((tmp = strchr(tmp2, '!')) == NULL) if ((tmp = strchr(tmp2, '!')) == NULL)
@throw [OFInvalidFormatException newWithClass: isa]; @throw [OFInvalidFormatException
exceptionWithClass: isa];
*tmp = '\0'; *tmp = '\0';
username = [[OFString alloc] initWithUTF8String: tmp + 1]; username = [[OFString alloc] initWithUTF8String: tmp + 1];