@@ -185,13 +185,13 @@ } return self; } -- (instancetype)OF_initWithUTF8String: (const char*)UTF8String +- (instancetype)OF_initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength - storage: (char*)storage + storage: (char *)storage { self = [super init]; @try { if (UTF8StringLength >= 3 && @@ -222,11 +222,11 @@ } return self; } -- initWithCString: (const char*)cString +- initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { self = [super init]; @@ -386,11 +386,11 @@ } return self; } -- initWithUTF8StringNoCopy: (char*)UTF8String +- initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { self = [super init]; @try { @@ -402,11 +402,11 @@ UTF8StringLength -= 3; } _s = &_storage; - _s->cString = (char*)UTF8String; + _s->cString = (char *)UTF8String; _s->cStringLength = UTF8StringLength; if (freeWhenDone) _s->freeWhenDone = UTF8String; @@ -424,11 +424,11 @@ } return self; } -- initWithString: (OFString*)string +- initWithString: (OFString *)string { self = [super init]; @try { _s = &_storage; @@ -435,11 +435,11 @@ _s->cStringLength = [string UTF8StringLength]; if ([string isKindOfClass: [OFString_UTF8 class]] || [string isKindOfClass: [OFMutableString_UTF8 class]]) - _s->isUTF8 = ((OFString_UTF8*)string)->_s->isUTF8; + _s->isUTF8 = ((OFString_UTF8 *)string)->_s->isUTF8; else _s->isUTF8 = true; _s->length = [string length]; @@ -451,11 +451,11 @@ } return self; } -- initWithCharacters: (const of_unichar_t*)characters +- initWithCharacters: (const of_unichar_t *)characters length: (size_t)length { self = [super init]; @try { @@ -495,11 +495,11 @@ } return self; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @@ -580,11 +580,11 @@ } return self; } -- initWithUTF32String: (const of_char32_t*)characters +- initWithUTF32String: (const of_char32_t *)characters length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @@ -647,11 +647,11 @@ } return self; } -- initWithFormat: (OFConstantString*)format +- initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { self = [super init]; @try { @@ -699,11 +699,11 @@ free(_s->freeWhenDone); [super dealloc]; } -- (size_t)getCString: (char*)cString +- (size_t)getCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding { switch (encoding) { case OF_STRING_ENCODING_ASCII: @@ -722,11 +722,11 @@ maxLength: maxLength encoding: encoding]; } } -- (const char*)cStringWithEncoding: (of_string_encoding_t)encoding +- (const char *)cStringWithEncoding: (of_string_encoding_t)encoding { switch (encoding) { case OF_STRING_ENCODING_ASCII: if (_s->isUTF8) @throw [OFInvalidEncodingException exception]; @@ -736,11 +736,11 @@ default: return [super cStringWithEncoding: encoding]; } } -- (const char*)UTF8String +- (const char *)UTF8String { return _s->cString; } - (size_t)length @@ -802,11 +802,11 @@ return OF_ORDERED_SAME; if (![object isKindOfClass: [OFString class]]) @throw [OFInvalidArgumentException exception]; - otherString = (OFString*)object; + otherString = (OFString *)object; otherCStringLength = [otherString UTF8StringLength]; minimumCStringLength = (_s->cStringLength > otherCStringLength ? otherCStringLength : _s->cStringLength); if ((compare = memcmp(_s->cString, [otherString UTF8String], @@ -822,11 +822,11 @@ return OF_ORDERED_DESCENDING; else return OF_ORDERED_ASCENDING; } -- (of_comparison_result_t)caseInsensitiveCompare: (OFString*)otherString +- (of_comparison_result_t)caseInsensitiveCompare: (OFString *)otherString { const char *otherCString; size_t otherCStringLength, minimumCStringLength; #ifdef OF_HAVE_UNICODE_TABLES size_t i, j; @@ -962,11 +962,11 @@ @throw [OFInvalidEncodingException exception]; return character; } -- (void)getCharacters: (of_unichar_t*)buffer +- (void)getCharacters: (of_unichar_t *)buffer inRange: (of_range_t)range { /* TODO: Could be slightly optimized */ void *pool = objc_autoreleasePoolPush(); const of_unichar_t *characters = [self characters]; @@ -979,11 +979,11 @@ range.length * sizeof(of_unichar_t)); objc_autoreleasePoolPop(pool); } -- (of_range_t)rangeOfString: (OFString*)string +- (of_range_t)rangeOfString: (OFString *)string options: (int)options range: (of_range_t)range { const char *cString = [string UTF8String]; size_t cStringLength = [string UTF8StringLength]; @@ -1039,11 +1039,11 @@ } return of_range(OF_NOT_FOUND, 0); } -- (bool)containsString: (OFString*)string +- (bool)containsString: (OFString *)string { const char *cString = [string UTF8String]; size_t cStringLength = [string UTF8StringLength]; if (cStringLength == 0) @@ -1057,11 +1057,11 @@ return true; return false; } -- (OFString*)substringWithRange: (of_range_t)range +- (OFString *)substringWithRange: (of_range_t)range { size_t start = range.location; size_t end = range.location + range.length; if (range.length > SIZE_MAX - range.location || end > _s->length) @@ -1076,21 +1076,21 @@ return [OFString stringWithUTF8String: _s->cString + start length: end - start]; } -- (bool)hasPrefix: (OFString*)prefix +- (bool)hasPrefix: (OFString *)prefix { size_t cStringLength = [prefix UTF8StringLength]; if (cStringLength > _s->cStringLength) return false; return (memcmp(_s->cString, [prefix UTF8String], cStringLength) == 0); } -- (bool)hasSuffix: (OFString*)suffix +- (bool)hasSuffix: (OFString *)suffix { size_t cStringLength = [suffix UTF8StringLength]; if (cStringLength > _s->cStringLength) return false; @@ -1097,12 +1097,12 @@ return (memcmp(_s->cString + (_s->cStringLength - cStringLength), [suffix UTF8String], cStringLength) == 0); } -- (OFArray*)componentsSeparatedByString: (OFString*)delimiter - options: (int)options +- (OFArray *)componentsSeparatedByString: (OFString *)delimiter + options: (int)options { void *pool; OFMutableArray *array; const char *cString = [delimiter UTF8String]; size_t cStringLength = [delimiter UTF8StringLength]; @@ -1142,11 +1142,11 @@ objc_autoreleasePoolPop(pool); return array; } -- (OFArray*)pathComponents +- (OFArray *)pathComponents { OFMutableArray *ret; void *pool; size_t i, last = 0, pathCStringLength = _s->cStringLength; @@ -1188,11 +1188,11 @@ objc_autoreleasePoolPop(pool); return ret; } -- (OFString*)lastPathComponent +- (OFString *)lastPathComponent { size_t pathCStringLength = _s->cStringLength; ssize_t i; if (pathCStringLength == 0) @@ -1223,11 +1223,11 @@ return [OFString stringWithUTF8String: _s->cString + i length: pathCStringLength - i]; } -- (OFString*)stringByDeletingLastPathComponent +- (OFString *)stringByDeletingLastPathComponent { size_t pathCStringLength = _s->cStringLength; if (pathCStringLength == 0) return @""; @@ -1249,11 +1249,11 @@ length: 1]; return OF_PATH_CURRENT_DIRECTORY; } -- (const of_unichar_t*)characters +- (const of_unichar_t *)characters { OFObject *object = [[[OFObject alloc] init] autorelease]; of_unichar_t *ret; size_t i, j; @@ -1277,11 +1277,11 @@ } return ret; } -- (const of_char32_t*)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder +- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder { OFObject *object = [[[OFObject alloc] init] autorelease]; of_char32_t *ret; size_t i, j;