@@ -349,21 +349,19 @@ for (size_t i = 0; i < length; i++) { of_unichar_t c = characters[i]; const char *const *page; if (c >= size) { - [ret appendCharacters: &c - length: 1]; + [ret appendCharacters: &c length: 1]; continue; } page = table[c >> 8]; if (page != NULL && page[c & 0xFF] != NULL) [ret appendUTF8String: page[c & 0xFF]]; else - [ret appendCharacters: &c - length: 1]; + [ret appendCharacters: &c length: 1]; } objc_autoreleasePoolPop(pool); return ret; @@ -966,12 +964,11 @@ { id ret; va_list arguments; va_start(arguments, format); - ret = [self initWithFormat: format - arguments: arguments]; + ret = [self initWithFormat: format arguments: arguments]; va_end(arguments); return ret; } @@ -1022,12 +1019,11 @@ if (SIZE_MAX - (size_t)fileSize < 1) @throw [OFOutOfRangeException exception]; tmp = of_alloc((size_t)fileSize + 1, 1); @try { - file = [[OFFile alloc] initWithPath: path - mode: @"r"]; + file = [[OFFile alloc] initWithPath: path mode: @"r"]; [file readIntoBuffer: tmp exactLength: (size_t)fileSize]; } @catch (id e) { free(tmp); @@ -1443,18 +1439,16 @@ } } - (const char *)cStringWithEncoding: (of_string_encoding_t)encoding { - return [self of_cStringWithEncoding: encoding - lossy: false]; + return [self of_cStringWithEncoding: encoding lossy: false]; } - (const char *)lossyCStringWithEncoding: (of_string_encoding_t)encoding { - return [self of_cStringWithEncoding: encoding - lossy: true]; + return [self of_cStringWithEncoding: encoding lossy: true]; } - (const char *)UTF8String { return [self cStringWithEncoding: OF_STRING_ENCODING_UTF_8]; @@ -1720,42 +1714,33 @@ return [element autorelease]; } - (OFString *)JSONRepresentation { - return [self of_JSONRepresentationWithOptions: 0 - depth: 0]; + return [self of_JSONRepresentationWithOptions: 0 depth: 0]; } - (OFString *)JSONRepresentationWithOptions: (int)options { - return [self of_JSONRepresentationWithOptions: options - depth: 0]; + return [self of_JSONRepresentationWithOptions: options depth: 0]; } - (OFString *)of_JSONRepresentationWithOptions: (int)options depth: (size_t)depth { OFMutableString *JSON = [[self mutableCopy] autorelease]; /* FIXME: This is slow! Write it in pure C! */ - [JSON replaceOccurrencesOfString: @"\\" - withString: @"\\\\"]; - [JSON replaceOccurrencesOfString: @"\"" - withString: @"\\\""]; - [JSON replaceOccurrencesOfString: @"\b" - withString: @"\\b"]; - [JSON replaceOccurrencesOfString: @"\f" - withString: @"\\f"]; - [JSON replaceOccurrencesOfString: @"\r" - withString: @"\\r"]; - [JSON replaceOccurrencesOfString: @"\t" - withString: @"\\t"]; + [JSON replaceOccurrencesOfString: @"\\" withString: @"\\\\"]; + [JSON replaceOccurrencesOfString: @"\"" withString: @"\\\""]; + [JSON replaceOccurrencesOfString: @"\b" withString: @"\\b"]; + [JSON replaceOccurrencesOfString: @"\f" withString: @"\\f"]; + [JSON replaceOccurrencesOfString: @"\r" withString: @"\\r"]; + [JSON replaceOccurrencesOfString: @"\t" withString: @"\\t"]; if (options & OF_JSON_REPRESENTATION_JSON5) { - [JSON replaceOccurrencesOfString: @"\n" - withString: @"\\\n"]; + [JSON replaceOccurrencesOfString: @"\n" withString: @"\\\n"]; if (options & OF_JSON_REPRESENTATION_IDENTIFIER) { const char *cString = self.UTF8String; if ((!of_ascii_isalpha(cString[0]) && @@ -1767,12 +1752,11 @@ } else { [JSON prependString: @"\""]; [JSON appendString: @"\""]; } } else { - [JSON replaceOccurrencesOfString: @"\n" - withString: @"\\n"]; + [JSON replaceOccurrencesOfString: @"\n" withString: @"\\n"]; [JSON prependString: @"\""]; [JSON appendString: @"\""]; } @@ -1789,48 +1773,41 @@ length = self.UTF8StringLength; if (length <= 31) { uint8_t tmp = 0xA0 | ((uint8_t)length & 0x1F); - data = [OFMutableData dataWithItemSize: 1 - capacity: length + 1]; + data = [OFMutableData dataWithItemSize: 1 capacity: length + 1]; [data addItem: &tmp]; } else if (length <= UINT8_MAX) { uint8_t type = 0xD9; uint8_t tmp = (uint8_t)length; - data = [OFMutableData dataWithItemSize: 1 - capacity: length + 2]; + data = [OFMutableData dataWithItemSize: 1 capacity: length + 2]; [data addItem: &type]; [data addItem: &tmp]; } else if (length <= UINT16_MAX) { uint8_t type = 0xDA; uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)length); - data = [OFMutableData dataWithItemSize: 1 - capacity: length + 3]; + data = [OFMutableData dataWithItemSize: 1 capacity: length + 3]; [data addItem: &type]; - [data addItems: &tmp - count: sizeof(tmp)]; + [data addItems: &tmp count: sizeof(tmp)]; } else if (length <= UINT32_MAX) { uint8_t type = 0xDB; uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)length); - data = [OFMutableData dataWithItemSize: 1 - capacity: length + 5]; + data = [OFMutableData dataWithItemSize: 1 capacity: length + 5]; [data addItem: &type]; - [data addItems: &tmp - count: sizeof(tmp)]; + [data addItems: &tmp count: sizeof(tmp)]; } else @throw [OFOutOfRangeException exception]; - [data addItems: self.UTF8String - count: length]; + [data addItems: self.UTF8String count: length]; return data; } - (of_range_t)rangeOfString: (OFString *)string @@ -1870,12 +1847,11 @@ searchCharacters = string.characters; characters = of_alloc(range.length, sizeof(of_unichar_t)); @try { - [self getCharacters: characters - inRange: range]; + [self getCharacters: characters inRange: range]; if (options & OF_STRING_SEARCH_BACKWARDS) { for (size_t i = range.length - searchLength;; i--) { if (memcmp(characters + i, searchCharacters, searchLength * sizeof(of_unichar_t)) == 0) { @@ -1938,12 +1914,11 @@ if (range.length > SIZE_MAX / sizeof(of_unichar_t)) @throw [OFOutOfRangeException exception]; characters = of_alloc(range.length, sizeof(of_unichar_t)); @try { - [self getCharacters: characters - inRange: range]; + [self getCharacters: characters inRange: range]; if (options & OF_STRING_SEARCH_BACKWARDS) { for (size_t i = range.length - 1;; i--) { if (characterIsMember(characterSet, @selector(characterIsMember:), @@ -2042,135 +2017,101 @@ { OFString *ret; va_list arguments; va_start(arguments, format); - ret = [self stringByAppendingFormat: format - arguments: arguments]; + ret = [self stringByAppendingFormat: format arguments: arguments]; va_end(arguments); return ret; } - (OFString *)stringByAppendingFormat: (OFConstantString *)format arguments: (va_list)arguments { - OFMutableString *new; - - new = [OFMutableString stringWithString: self]; - [new appendFormat: format - arguments: arguments]; - + OFMutableString *new = [OFMutableString stringWithString: self]; + [new appendFormat: format arguments: arguments]; [new makeImmutable]; - return new; } - (OFString *)stringByPrependingString: (OFString *)string { OFMutableString *new = [[string mutableCopy] autorelease]; - [new appendString: self]; - [new makeImmutable]; - return new; } - (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string withString: (OFString *)replacement { OFMutableString *new = [[self mutableCopy] autorelease]; - - [new replaceOccurrencesOfString: string - withString: replacement]; - + [new replaceOccurrencesOfString: string withString: replacement]; [new makeImmutable]; - return new; } - (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string withString: (OFString *)replacement options: (int)options range: (of_range_t)range { OFMutableString *new = [[self mutableCopy] autorelease]; - [new replaceOccurrencesOfString: string withString: replacement options: options range: range]; - [new makeImmutable]; - return new; } - (OFString *)uppercaseString { OFMutableString *new = [[self mutableCopy] autorelease]; - [new uppercase]; - [new makeImmutable]; - return new; } - (OFString *)lowercaseString { OFMutableString *new = [[self mutableCopy] autorelease]; - [new lowercase]; - [new makeImmutable]; - return new; } - (OFString *)capitalizedString { OFMutableString *new = [[self mutableCopy] autorelease]; - [new capitalize]; - [new makeImmutable]; - return new; } - (OFString *)stringByDeletingLeadingWhitespaces { OFMutableString *new = [[self mutableCopy] autorelease]; - [new deleteLeadingWhitespaces]; - [new makeImmutable]; - return new; } - (OFString *)stringByDeletingTrailingWhitespaces { OFMutableString *new = [[self mutableCopy] autorelease]; - [new deleteTrailingWhitespaces]; - [new makeImmutable]; - return new; } - (OFString *)stringByDeletingEnclosingWhitespaces { OFMutableString *new = [[self mutableCopy] autorelease]; - [new deleteEnclosingWhitespaces]; - [new makeImmutable]; - return new; } - (bool)hasPrefix: (OFString *)prefix { @@ -2183,12 +2124,11 @@ tmp = of_alloc(prefixLength, sizeof(of_unichar_t)); @try { void *pool = objc_autoreleasePoolPush(); - [self getCharacters: tmp - inRange: of_range(0, prefixLength)]; + [self getCharacters: tmp inRange: of_range(0, prefixLength)]; hasPrefix = (memcmp(tmp, prefix.characters, prefixLength * sizeof(of_unichar_t)) == 0); objc_autoreleasePoolPop(pool); @@ -2231,12 +2171,11 @@ return hasSuffix; } - (OFArray *)componentsSeparatedByString: (OFString *)delimiter { - return [self componentsSeparatedByString: delimiter - options: 0]; + return [self componentsSeparatedByString: delimiter options: 0]; } - (OFArray *)componentsSeparatedByString: (OFString *)delimiter options: (int)options { @@ -2601,12 +2540,11 @@ size_t length = self.length; of_unichar_t *buffer; buffer = of_alloc(length, sizeof(of_unichar_t)); @try { - [self getCharacters: buffer - inRange: of_range(0, length)]; + [self getCharacters: buffer inRange: of_range(0, length)]; return [[OFData dataWithItemsNoCopy: buffer count: length itemSize: sizeof(of_unichar_t) freeWhenDone: true] items]; @@ -2703,12 +2641,11 @@ size_t length = self.length; of_char32_t *buffer; buffer = of_alloc(length + 1, sizeof(of_char32_t)); @try { - [self getCharacters: buffer - inRange: of_range(0, length)]; + [self getCharacters: buffer inRange: of_range(0, length)]; buffer[length] = 0; if (byteOrder != OF_BYTE_ORDER_NATIVE) for (size_t i = 0; i < length; i++) buffer[i] = OF_BSWAP32(buffer[i]); @@ -2782,33 +2719,29 @@ #endif #ifdef OF_HAVE_FILES - (void)writeToFile: (OFString *)path { - [self writeToFile: path - encoding: OF_STRING_ENCODING_UTF_8]; + [self writeToFile: path encoding: OF_STRING_ENCODING_UTF_8]; } - (void)writeToFile: (OFString *)path encoding: (of_string_encoding_t)encoding { void *pool = objc_autoreleasePoolPush(); - OFFile *file; - file = [OFFile fileWithPath: path - mode: @"w"]; + OFFile *file = [OFFile fileWithPath: path mode: @"w"]; [file writeString: self encoding: encoding]; objc_autoreleasePoolPop(pool); } #endif - (void)writeToURL: (OFURL *)URL { - [self writeToURL: URL - encoding: OF_STRING_ENCODING_UTF_8]; + [self writeToURL: URL encoding: OF_STRING_ENCODING_UTF_8]; } - (void)writeToURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { @@ -2817,14 +2750,12 @@ OFStream *stream; if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil) @throw [OFUnsupportedProtocolException exceptionWithURL: URL]; - stream = [URLHandler openItemAtURL: URL - mode: @"w"]; - [stream writeString: self - encoding: encoding]; + stream = [URLHandler openItemAtURL: URL mode: @"w"]; + [stream writeString: self encoding: encoding]; objc_autoreleasePoolPop(pool); } #ifdef OF_HAVE_BLOCKS