@@ -168,11 +168,11 @@ - (of_http_request_protocol_version_t)protocolVersion { return _protocolVersion; } -- (void)setProtocolVersionFromString: (OFString*)string +- (void)setProtocolVersionFromString: (OFString *)string { void *pool = objc_autoreleasePoolPush(); OFArray *components = [string componentsSeparatedByString: @"."]; intmax_t major, minor; of_http_request_protocol_version_t protocolVersion; @@ -192,23 +192,23 @@ [self setProtocolVersion: protocolVersion]; objc_autoreleasePoolPop(pool); } -- (OFString*)protocolVersionString +- (OFString *)protocolVersionString { return [OFString stringWithFormat: @"%u.%u", _protocolVersion.major, _protocolVersion.minor]; } -- (OFString*)string +- (OFString *)string { return [self stringWithEncoding: OF_STRING_ENCODING_AUTODETECT]; } -- (OFString*)stringWithEncoding: (of_string_encoding_t)encoding +- (OFString *)stringWithEncoding: (of_string_encoding_t)encoding { void *pool = objc_autoreleasePoolPush(); OFString *contentType, *contentLength, *ret; OFDataArray *data; @@ -223,20 +223,20 @@ if ((contentLength = [_headers objectForKey: @"Content-Length"]) != nil) if ([data count] != (size_t)[contentLength decimalValue]) @throw [OFTruncatedDataException exception]; - ret = [[OFString alloc] initWithCString: (char*)[data items] + ret = [[OFString alloc] initWithCString: (char *)[data items] encoding: encoding length: [data count]]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } -- (OFString*)description +- (OFString *)description { void *pool = objc_autoreleasePoolPush(); OFString *indentedHeaders, *ret; indentedHeaders = [[_headers description]