Differences From Artifact [e6372d29b7]:
- File src/OFString.m — part of check-in [1b82d3bf4f] at 2021-03-07 20:25:21 on branch trunk — *.m: Fold methods into one line where it fits (user: js, size: 67075) [annotate] [blame] [check-ins using]
To Artifact [ff9b0b5a48]:
- File
src/OFString.m
— part of check-in
[1a49ef773d]
at
2021-03-08 00:00:52
on branch trunk
— Make +[stringWithContentsOfURL:] always available
Even when there is neither files nor sockets, a scheme could still be
registered, for example for files embedded into the binary. (user: js, size: 66951) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
567 568 569 570 571 572 573 |
encoding: (of_string_encoding_t)encoding
{
return (id)[[OFUTF8String alloc] initWithContentsOfFile: path
encoding: encoding];
}
#endif
| < < | 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 |
encoding: (of_string_encoding_t)encoding
{
return (id)[[OFUTF8String alloc] initWithContentsOfFile: path
encoding: encoding];
}
#endif
- (instancetype)initWithContentsOfURL: (OFURL *)URL
{
return (id)[[OFUTF8String alloc] initWithContentsOfURL: URL];
}
- (instancetype)initWithContentsOfURL: (OFURL *)URL
encoding: (of_string_encoding_t)encoding
{
return (id)[[OFUTF8String alloc] initWithContentsOfURL: URL
encoding: encoding];
}
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFUTF8String alloc] initWithSerialization: element];
}
- (instancetype)retain
|
| ︙ | ︙ | |||
783 784 785 786 787 788 789 |
encoding: (of_string_encoding_t)encoding
{
return [[[self alloc] initWithContentsOfFile: path
encoding: encoding] autorelease];
}
#endif
| < < | 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 |
encoding: (of_string_encoding_t)encoding
{
return [[[self alloc] initWithContentsOfFile: path
encoding: encoding] autorelease];
}
#endif
+ (instancetype)stringWithContentsOfURL: (OFURL *)URL
{
return [[[self alloc] initWithContentsOfURL: URL] autorelease];
}
+ (instancetype)stringWithContentsOfURL: (OFURL *)URL
encoding: (of_string_encoding_t)encoding
{
return [[[self alloc] initWithContentsOfURL: URL
encoding: encoding] autorelease];
}
- (instancetype)init
{
if ([self isMemberOfClass: [OFString class]]) {
@try {
[self doesNotRecognizeSelector: _cmd];
} @catch (id e) {
|
| ︙ | ︙ |