Overview
| Comment: | Make +[stringWithContentsOfURL:] always available
Even when there is neither files nor sockets, a scheme could still be |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
1a49ef773d447c03a422b8fbef94baf4 |
| User & Date: | js on 2021-03-08 00:00:52 |
| Other Links: | manifest | tags |
Context
|
2021-03-08
| ||
| 00:04 | Make GCC happy again check-in: eb328735f2 user: js tags: trunk | |
| 00:00 | Make +[stringWithContentsOfURL:] always available check-in: 1a49ef773d user: js tags: trunk | |
|
2021-03-07
| ||
| 20:25 | *.m: Fold methods into one line where it fits check-in: 1b82d3bf4f user: js tags: trunk | |
Changes
Modified src/OFMutableString.m from [65e4058789] to [e8ac978dc5].
| ︙ | ︙ | |||
170 171 172 173 174 175 176 |
{
return (id)[[OFMutableUTF8String alloc]
initWithContentsOfFile: path
encoding: encoding];
}
#endif
| < < | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 |
{
return (id)[[OFMutableUTF8String alloc]
initWithContentsOfFile: path
encoding: encoding];
}
#endif
- (instancetype)initWithContentsOfURL: (OFURL *)URL
{
return (id)[[OFMutableUTF8String alloc] initWithContentsOfURL: URL];
}
- (instancetype)initWithContentsOfURL: (OFURL *)URL
encoding: (of_string_encoding_t)encoding
{
return (id)[[OFMutableUTF8String alloc]
initWithContentsOfURL: URL
encoding: encoding];
}
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFMutableUTF8String alloc] initWithSerialization: element];
}
- (instancetype)retain
|
| ︙ | ︙ |
Modified src/OFString.h from [8eb0a45d6e] to [d557fd2664].
| ︙ | ︙ | |||
513 514 515 516 517 518 519 | * @param encoding The encoding of the file * @return A new autoreleased OFString */ + (instancetype)stringWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding; # endif | < | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | * @param encoding The encoding of the file * @return A new autoreleased OFString */ + (instancetype)stringWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding; # endif /** * @brief Creates a new OFString with the contents of the specified URL. * * If the URL's scheme is file, it tries UTF-8 encoding. * * If the URL's scheme is http(s), it tries to detect the encoding from the HTTP * headers. If it could not detect the encoding using the HTTP headers, it tries |
| ︙ | ︙ | |||
538 539 540 541 542 543 544 | * * @param URL The URL to the contents for the string * @param encoding The encoding to assume * @return A new autoreleased OFString */ + (instancetype)stringWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding; | < | 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | * * @param URL The URL to the contents for the string * @param encoding The encoding to assume * @return A new autoreleased OFString */ + (instancetype)stringWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding; /** * @brief Initializes an already allocated OFString from a UTF-8 encoded C * string. * * @param UTF8String A UTF-8 encoded C string to initialize the OFString with * @return An initialized OFString |
| ︙ | ︙ |
Modified src/OFString.m from [e6372d29b7] to [ff9b0b5a48].
| ︙ | ︙ | |||
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) {
|
| ︙ | ︙ |