Differences From Artifact [5197d0902a]:
- File
src/OFURL.m
— part of check-in
[dae363ef82]
at
2018-02-16 22:25:08
on branch trunk
— Remove OF_UNAVAILABLE from two -[init] methods
These were unavailable in the immutable class, but available in the
mutable subclass. However, Clang 3.4 does not support this. (user: js, size: 23279) [annotate] [blame] [check-ins using]
To Artifact [bb7c13caac]:
- File
src/OFURL.m
— part of check-in
[81156ee75a]
at
2018-02-25 17:16:23
on branch trunk
— No self = [self init…] with self-releasing @catch
When using self = [self init…], this already releases self on an
exception, so using it inside of a @try / @catch block that releases
self would lead to a double-release. (user: js, size: 23329) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
596 597 598 599 600 601 602 603 604 |
return self;
}
#ifdef OF_HAVE_FILES
- (instancetype)initFileURLWithPath: (OFString *)path
{
@try {
void *pool = objc_autoreleasePoolPush();
| > > < < < > > > | 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 |
return self;
}
#ifdef OF_HAVE_FILES
- (instancetype)initFileURLWithPath: (OFString *)path
{
bool isDirectory;
@try {
void *pool = objc_autoreleasePoolPush();
isDirectory = ([path hasSuffix: OF_PATH_DELIMITER_STRING] ||
[OFURLHandler_file of_directoryExistsAtPath: path]);
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
self = [self initFileURLWithPath: path
isDirectory: isDirectory];
return self;
}
- (instancetype)initFileURLWithPath: (OFString *)path
isDirectory: (bool)isDirectory
{
|
| ︙ | ︙ | |||
674 675 676 677 678 679 680 |
return self;
}
#endif
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
| < | > > | < < > > > > | 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 |
return self;
}
#endif
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
void *pool = objc_autoreleasePoolPush();
OFString *stringValue;
@try {
if (![[element name] isEqual: [self className]] ||
![[element namespace] isEqual: OF_SERIALIZATION_NS])
@throw [OFInvalidArgumentException exception];
stringValue = [element stringValue];
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithString: stringValue];
objc_autoreleasePoolPop(pool);
return self;
}
- (void)dealloc
{
[_URLEncodedScheme release];
|
| ︙ | ︙ |