Differences From Artifact [18c9b8230b]:
- File
src/OFString.m
— part of check-in
[23e57c5040]
at
2017-07-22 23:04:35
on branch trunk
— OFFile: Simplify mode
This removes "b" for binary and always uses binary, as there is no good
reason to not use binary. (user: js, size: 65349) [annotate] [blame] [check-ins using]
To Artifact [3b9b1e2811]:
- File src/OFString.m — part of check-in [9aacc26542] at 2017-07-23 17:55:16 on branch trunk — Add +[OFString stringWithData:encoding:] (user: js, size: 66043) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
465 466 467 468 469 470 471 472 473 474 475 476 477 478 | storage: storage]; } return (id)[[OFString_UTF8 alloc] initWithCString: cString encoding: encoding length: cStringLength]; } - initWithString: (OFString *)string { return (id)[[OFString_UTF8 alloc] initWithString: string]; } - initWithCharacters: (const of_unichar_t *)string | > > > > > > > | 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 | storage: storage]; } return (id)[[OFString_UTF8 alloc] initWithCString: cString encoding: encoding length: cStringLength]; } - initWithData: (OFData *)data encoding: (of_string_encoding_t)encoding { return (id)[[OFString_UTF8 alloc] initWithData: data encoding: encoding]; } - initWithString: (OFString *)string { return (id)[[OFString_UTF8 alloc] initWithString: string]; } - initWithCharacters: (const of_unichar_t *)string |
︙ | ︙ | |||
671 672 673 674 675 676 677 678 679 680 681 682 683 684 | encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { return [[[self alloc] initWithCString: cString encoding: encoding length: cStringLength] autorelease]; } + (instancetype)stringWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } + (instancetype)stringWithCharacters: (const of_unichar_t *)string | > > > > > > > | 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 | encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { return [[[self alloc] initWithCString: cString encoding: encoding length: cStringLength] autorelease]; } + (instancetype)stringWithData: (OFData *)data encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithData: data encoding: encoding] autorelease]; } + (instancetype)stringWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } + (instancetype)stringWithCharacters: (const of_unichar_t *)string |
︙ | ︙ | |||
849 850 851 852 853 854 855 856 857 858 859 860 861 862 | - initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { OF_INVALID_INIT_METHOD } - initWithString: (OFString *)string { OF_INVALID_INIT_METHOD } - initWithCharacters: (const of_unichar_t *)string | > > > > > > > > > > > > > > > > > > | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 | - initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { OF_INVALID_INIT_METHOD } - initWithData: (OFData *)data encoding: (of_string_encoding_t)encoding { @try { if ([data itemSize] != 1) @throw [OFInvalidArgumentException exception]; self = [self initWithCString: [data items] encoding: encoding length: [data count]]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithString: (OFString *)string { OF_INVALID_INIT_METHOD } - initWithCharacters: (const of_unichar_t *)string |
︙ | ︙ |