Adjust to ObjFW changes

This commit is contained in:
Jonathan Schleifer 2019-10-04 01:42:04 +02:00
parent 781af5edef
commit f82922df02
No known key found for this signature in database
GPG key ID: 79D21189A2D4708D
4 changed files with 12 additions and 14 deletions

View file

@ -1,3 +1,3 @@
package_description 1
package_format 1
package_depends_on ObjOpenSSL
LIBS="-lobjxmpp $LIBS"

View file

@ -297,9 +297,7 @@
- (void)resolver: (OFDNSResolver *)resolver
didResolveDomainName: (OFString *)domainName
answerRecords: (OFDictionary *)answerRecords
authorityRecords: (OFDictionary *)authorityRecords
additionalRecords: (OFDictionary *)additionalRecords
response: (OFDNSResponse *)response
exception: (id)exception
{
OFMutableArray *records = [OFMutableArray array];
@ -313,7 +311,7 @@
}
for (OFDNSResourceRecord *record in
[answerRecords objectForKey: domainName])
[response.answerRecords objectForKey: domainName])
if ([record isKindOfClass: [OFSRVDNSResourceRecord class]])
[records addObject: record];
@ -349,11 +347,12 @@
else {
OFString *SRVDomain = [_domainToASCII
stringByPrependingString: @"_xmpp-client._tcp."];
[[OFThread DNSResolver]
asyncResolveHost: SRVDomain
OFDNSRequest *request = [OFDNSRequest
requestWithHost: SRVDomain
recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN
recordType: OF_DNS_RESOURCE_RECORD_TYPE_SRV
delegate: self];
recordType: OF_DNS_RESOURCE_RECORD_TYPE_SRV];
[[OFThread DNSResolver] asyncPerformRequest: request
delegate: self];
}
objc_autoreleasePoolPop(pool);

View file

@ -29,7 +29,6 @@
#import <ObjFW/OFDictionary.h>
#import <ObjFW/OFNumber.h>
#import <ObjFW/OFData.h>
#import <ObjFW/OFAutoreleasePool.h>
#import <ObjFW/OFNotImplementedException.h>
@ -46,7 +45,7 @@
self = [super init];
@try {
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
void *pool = objc_autoreleasePoolPush();
_file = [file copy];
@try {
@ -56,7 +55,7 @@
_data = [[OFMutableDictionary alloc] init];
}
[pool release];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;

View file

@ -208,7 +208,7 @@
- (OFData *)continueWithData: (OFData *)data
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
void *pool = objc_autoreleasePoolPush();
OFData *ret;
if (!_serverSignature)
@ -217,7 +217,7 @@
ret = [self xmpp_parseServerFinalMessage: data];
[ret retain];
[pool release];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}