Differences From Artifact [76e87b40ed]:
- File
src/OFString.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 55902) [annotate] [blame] [check-ins using]
To Artifact [250db502f2]:
- File src/OFString.m — part of check-in [590c377d8a] at 2013-04-26 19:42:52 on branch trunk — Make it possible to disable sockets. (user: js, size: 56139) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFString.h" #import "OFString_UTF8.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFFile.h" #import "OFURL.h" | > | | | > > | > > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | #import "OFString.h" #import "OFString_UTF8.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFFile.h" #import "OFURL.h" #ifdef OF_HAVE_SOCKETS # import "OFHTTPClient.h" # import "OFHTTPRequest.h" # import "OFHTTPRequestReply.h" #endif #import "OFDataArray.h" #import "OFXMLElement.h" #ifdef OF_HAVE_SOCKETS # import "OFHTTPRequestFailedException.h" #endif #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" #import "OFNotImplementedException.h" #import "OFOpenFileFailedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFTruncatedDataException.h" #import "OFUnsupportedProtocolException.h" #import "autorelease.h" #import "macros.h" #import "of_asprintf.h" #import "unicode.h" /* |
| ︙ | ︙ | |||
903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 |
encoding: OF_STRING_ENCODING_AUTODETECT];
}
- initWithContentsOfURL: (OFURL*)URL
encoding: (of_string_encoding_t)encoding
{
void *pool;
OFHTTPClient *client;
OFHTTPRequest *request;
OFHTTPRequestReply *reply;
OFDictionary *headers;
OFString *contentType, *contentLength;
OFDataArray *data;
Class c;
c = [self class];
[self release];
pool = objc_autoreleasePoolPush();
if ([[URL scheme] isEqual: @"file"]) {
if (encoding == OF_STRING_ENCODING_AUTODETECT)
encoding = OF_STRING_ENCODING_UTF_8;
self = [[c alloc] initWithContentsOfFile: [URL path]
encoding: encoding];
objc_autoreleasePoolPop(pool);
return self;
}
client = [OFHTTPClient client];
request = [OFHTTPRequest requestWithURL: URL];
reply = [client performRequest: request];
if ([reply statusCode] != 200)
@throw [OFHTTPRequestFailedException
exceptionWithClass: [request class]
| > > > | 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 |
encoding: OF_STRING_ENCODING_AUTODETECT];
}
- initWithContentsOfURL: (OFURL*)URL
encoding: (of_string_encoding_t)encoding
{
void *pool;
#ifdef OF_HAVE_SOCKETS
OFHTTPClient *client;
OFHTTPRequest *request;
OFHTTPRequestReply *reply;
OFDictionary *headers;
OFString *contentType, *contentLength;
OFDataArray *data;
#endif
Class c;
c = [self class];
[self release];
pool = objc_autoreleasePoolPush();
if ([[URL scheme] isEqual: @"file"]) {
if (encoding == OF_STRING_ENCODING_AUTODETECT)
encoding = OF_STRING_ENCODING_UTF_8;
self = [[c alloc] initWithContentsOfFile: [URL path]
encoding: encoding];
objc_autoreleasePoolPop(pool);
return self;
}
#ifdef OF_HAVE_SOCKETS
client = [OFHTTPClient client];
request = [OFHTTPRequest requestWithURL: URL];
reply = [client performRequest: request];
if ([reply statusCode] != 200)
@throw [OFHTTPRequestFailedException
exceptionWithClass: [request class]
|
| ︙ | ︙ | |||
965 966 967 968 969 970 971 972 973 974 975 976 977 978 | if ([data count] != (size_t)[contentLength decimalValue]) @throw [OFTruncatedDataException exceptionWithClass: [self class]]; self = [[c alloc] initWithCString: (char*)[data items] encoding: encoding length: [data count]]; objc_autoreleasePoolPop(pool); return self; } - initWithSerialization: (OFXMLElement*)element | > > > | 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 | if ([data count] != (size_t)[contentLength decimalValue]) @throw [OFTruncatedDataException exceptionWithClass: [self class]]; self = [[c alloc] initWithCString: (char*)[data items] encoding: encoding length: [data count]]; #else @throw [OFUnsupportedProtocolException exceptionWithClass: c]; #endif objc_autoreleasePoolPop(pool); return self; } - initWithSerialization: (OFXMLElement*)element |
| ︙ | ︙ |