@@ -78,41 +78,41 @@ #if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) static locale_t cLocale; #endif @interface OFString () -- (size_t)OF_getCString: (char*)cString +- (size_t)OF_getCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding lossy: (bool)lossy; -- (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding - lossy: (bool)lossy; -- (OFString*)OF_JSONRepresentationWithOptions: (int)options - depth: (size_t)depth; +- (const char *)OF_cStringWithEncoding: (of_string_encoding_t)encoding + lossy: (bool)lossy; +- (OFString *)OF_JSONRepresentationWithOptions: (int)options + depth: (size_t)depth; @end -extern bool of_unicode_to_iso_8859_2(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_iso_8859_3(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_windows_1251(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_windows_1252(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_codepage_437(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_codepage_850(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_codepage_858(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_mac_roman(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_koi8_r(const of_unichar_t*, unsigned char*, - size_t, bool); -extern bool of_unicode_to_koi8_u(const of_unichar_t*, unsigned char*, +extern bool of_unicode_to_iso_8859_2(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_iso_8859_3(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_iso_8859_15(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_windows_1251(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_windows_1252(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_codepage_437(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_codepage_850(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_codepage_858(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_mac_roman(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_koi8_r(const of_unichar_t *, unsigned char *, + size_t, bool); +extern bool of_unicode_to_koi8_u(const of_unichar_t *, unsigned char *, size_t, bool); /* References for static linking */ void _references_to_categories_of_OFString(void) @@ -215,11 +215,11 @@ } ssize_t of_string_utf8_decode(const char *buffer_, size_t length, of_unichar_t *ret) { - const uint8_t *buffer = (const uint8_t*)buffer_; + const uint8_t *buffer = (const uint8_t *)buffer_; if (!(*buffer & 0x80)) { *ret = buffer[0]; return 1; } @@ -284,11 +284,11 @@ length++; return length; } -static OFString* +static OFString * standardizePath(OFArray *components, OFString *currentDirectory, OFString *parentDirectory, OFString *joinString) { void *pool = objc_autoreleasePoolPush(); OFMutableArray *array; @@ -359,11 +359,11 @@ - init { return (id)[[OFString_UTF8 alloc] init]; } -- initWithUTF8String: (const char*)UTF8String +- initWithUTF8String: (const char *)UTF8String { id string; size_t length; void *storage; @@ -374,11 +374,11 @@ return (id)[string OF_initWithUTF8String: UTF8String length: length storage: storage]; } -- initWithUTF8String: (const char*)UTF8String +- initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength { id string; void *storage; @@ -388,19 +388,19 @@ return (id)[string OF_initWithUTF8String: UTF8String length: UTF8StringLength storage: storage]; } -- initWithUTF8StringNoCopy: (char*)UTF8String +- initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { return (id)[[OFString_UTF8 alloc] initWithUTF8StringNoCopy: UTF8String freeWhenDone: freeWhenDone]; } -- initWithCString: (const char*)cString +- initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding { if (encoding == OF_STRING_ENCODING_UTF_8) { id string; size_t length; @@ -417,11 +417,11 @@ return (id)[[OFString_UTF8 alloc] initWithCString: cString encoding: encoding]; } -- initWithCString: (const char*)cString +- initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { if (encoding == OF_STRING_ENCODING_UTF_8) { id string; @@ -438,79 +438,79 @@ return (id)[[OFString_UTF8 alloc] initWithCString: cString encoding: encoding length: cStringLength]; } -- initWithString: (OFString*)string +- initWithString: (OFString *)string { return (id)[[OFString_UTF8 alloc] initWithString: string]; } -- initWithCharacters: (const of_unichar_t*)string +- initWithCharacters: (const of_unichar_t *)string length: (size_t)length { return (id)[[OFString_UTF8 alloc] initWithCharacters: string length: length]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string length: (size_t)length { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string length: length]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string byteOrder: byteOrder]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string length: length byteOrder: byteOrder]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string length: (size_t)length { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string length: length]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string byteOrder: byteOrder]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string length: length byteOrder: byteOrder]; } -- initWithFormat: (OFConstantString*)format, ... +- initWithFormat: (OFConstantString *)format, ... { id ret; va_list arguments; va_start(arguments, format); @@ -519,46 +519,46 @@ va_end(arguments); return ret; } -- initWithFormat: (OFConstantString*)format +- initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { return (id)[[OFString_UTF8 alloc] initWithFormat: format arguments: arguments]; } #ifdef OF_HAVE_FILES -- initWithContentsOfFile: (OFString*)path +- initWithContentsOfFile: (OFString *)path { return (id)[[OFString_UTF8 alloc] initWithContentsOfFile: path]; } -- initWithContentsOfFile: (OFString*)path +- initWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding { return (id)[[OFString_UTF8 alloc] initWithContentsOfFile: path encoding: encoding]; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) -- initWithContentsOfURL: (OFURL*)URL +- initWithContentsOfURL: (OFURL *)URL { return (id)[[OFString_UTF8 alloc] initWithContentsOfURL: URL]; } -- initWithContentsOfURL: (OFURL*)URL +- initWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { return (id)[[OFString_UTF8 alloc] initWithContentsOfURL: URL encoding: encoding]; } #endif -- initWithSerialization: (OFXMLElement*)element +- initWithSerialization: (OFXMLElement *)element { return (id)[[OFString_UTF8 alloc] initWithSerialization: element]; } - retain @@ -607,116 +607,116 @@ + (instancetype)string { return [[[self alloc] init] autorelease]; } -+ (instancetype)stringWithUTF8String: (const char*)UTF8String ++ (instancetype)stringWithUTF8String: (const char *)UTF8String { return [[[self alloc] initWithUTF8String: UTF8String] autorelease]; } -+ (instancetype)stringWithUTF8String: (const char*)UTF8String ++ (instancetype)stringWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength { return [[[self alloc] initWithUTF8String: UTF8String length: UTF8StringLength] autorelease]; } -+ (instancetype)stringWithUTF8StringNoCopy: (char*)UTF8String ++ (instancetype)stringWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { return [[[self alloc] initWithUTF8StringNoCopy: UTF8String freeWhenDone: freeWhenDone] autorelease]; } -+ (instancetype)stringWithCString: (const char*)cString ++ (instancetype)stringWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithCString: cString encoding: encoding] autorelease]; } -+ (instancetype)stringWithCString: (const char*)cString ++ (instancetype)stringWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { return [[[self alloc] initWithCString: cString encoding: encoding length: cStringLength] autorelease]; } -+ (instancetype)stringWithString: (OFString*)string ++ (instancetype)stringWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } -+ (instancetype)stringWithCharacters: (const of_unichar_t*)string ++ (instancetype)stringWithCharacters: (const of_unichar_t *)string length: (size_t)length { return [[[self alloc] initWithCharacters: string length: length] autorelease]; } -+ (instancetype)stringWithUTF16String: (const of_char16_t*)string ++ (instancetype)stringWithUTF16String: (const of_char16_t *)string { return [[[self alloc] initWithUTF16String: string] autorelease]; } -+ (instancetype)stringWithUTF16String: (const of_char16_t*)string ++ (instancetype)stringWithUTF16String: (const of_char16_t *)string length: (size_t)length { return [[[self alloc] initWithUTF16String: string length: length] autorelease]; } -+ (instancetype)stringWithUTF16String: (const of_char16_t*)string ++ (instancetype)stringWithUTF16String: (const of_char16_t *)string byteOrder: (of_byte_order_t)byteOrder { return [[[self alloc] initWithUTF16String: string byteOrder: byteOrder] autorelease]; } -+ (instancetype)stringWithUTF16String: (const of_char16_t*)string ++ (instancetype)stringWithUTF16String: (const of_char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return [[[self alloc] initWithUTF16String: string length: length byteOrder: byteOrder] autorelease]; } -+ (instancetype)stringWithUTF32String: (const of_char32_t*)string ++ (instancetype)stringWithUTF32String: (const of_char32_t *)string { return [[[self alloc] initWithUTF32String: string] autorelease]; } -+ (instancetype)stringWithUTF32String: (const of_char32_t*)string ++ (instancetype)stringWithUTF32String: (const of_char32_t *)string length: (size_t)length { return [[[self alloc] initWithUTF32String: string length: length] autorelease]; } -+ (instancetype)stringWithUTF32String: (const of_char32_t*)string ++ (instancetype)stringWithUTF32String: (const of_char32_t *)string byteOrder: (of_byte_order_t)byteOrder { return [[[self alloc] initWithUTF32String: string byteOrder: byteOrder] autorelease]; } -+ (instancetype)stringWithUTF32String: (const of_char32_t*)string ++ (instancetype)stringWithUTF32String: (const of_char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return [[[self alloc] initWithUTF32String: string length: length byteOrder: byteOrder] autorelease]; } -+ (instancetype)stringWithFormat: (OFConstantString*)format, ... ++ (instancetype)stringWithFormat: (OFConstantString *)format, ... { id ret; va_list arguments; va_start(arguments, format); @@ -726,38 +726,38 @@ return ret; } #ifdef OF_HAVE_FILES -+ (instancetype)stringWithContentsOfFile: (OFString*)path ++ (instancetype)stringWithContentsOfFile: (OFString *)path { return [[[self alloc] initWithContentsOfFile: path] autorelease]; } -+ (instancetype)stringWithContentsOfFile: (OFString*)path ++ (instancetype)stringWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfFile: path encoding: encoding] autorelease]; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) -+ (instancetype)stringWithContentsOfURL: (OFURL*)URL ++ (instancetype)stringWithContentsOfURL: (OFURL *)URL { return [[[self alloc] initWithContentsOfURL: URL] autorelease]; } -+ (instancetype)stringWithContentsOfURL: (OFURL*)URL ++ (instancetype)stringWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfURL: URL encoding: encoding] autorelease]; } #endif -+ (OFString*)pathWithComponents: (OFArray*)components ++ (OFString *)pathWithComponents: (OFArray *)components { OFMutableString *ret = [OFMutableString string]; bool first = true; for (OFString *component in components) { @@ -786,118 +786,118 @@ } return [super init]; } -- initWithUTF8String: (const char*)UTF8String +- initWithUTF8String: (const char *)UTF8String { return [self initWithCString: UTF8String encoding: OF_STRING_ENCODING_UTF_8 length: strlen(UTF8String)]; } -- initWithUTF8String: (const char*)UTF8String +- initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength { return [self initWithCString: UTF8String encoding: OF_STRING_ENCODING_UTF_8 length: UTF8StringLength]; } -- initWithUTF8StringNoCopy: (char*)UTF8String +- initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { return [self initWithUTF8String: UTF8String]; } -- initWithCString: (const char*)cString +- initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding { return [self initWithCString: cString encoding: encoding length: strlen(cString)]; } -- initWithCString: (const char*)cString +- initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { OF_INVALID_INIT_METHOD } -- initWithString: (OFString*)string +- initWithString: (OFString *)string { OF_INVALID_INIT_METHOD } -- initWithCharacters: (const of_unichar_t*)string +- initWithCharacters: (const of_unichar_t *)string length: (size_t)length { OF_INVALID_INIT_METHOD } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string { return [self initWithUTF16String: string length: of_string_utf16_length(string) byteOrder: OF_BYTE_ORDER_NATIVE]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string length: (size_t)length { return [self initWithUTF16String: string length: length byteOrder: OF_BYTE_ORDER_NATIVE]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string byteOrder: (of_byte_order_t)byteOrder { return [self initWithUTF16String: string length: of_string_utf16_length(string) byteOrder: byteOrder]; } -- initWithUTF16String: (const of_char16_t*)string +- initWithUTF16String: (const of_char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { OF_INVALID_INIT_METHOD } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string { return [self initWithUTF32String: string length: of_string_utf32_length(string) byteOrder: OF_BYTE_ORDER_NATIVE]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string length: (size_t)length { return [self initWithUTF32String: string length: length byteOrder: OF_BYTE_ORDER_NATIVE]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string byteOrder: (of_byte_order_t)byteOrder { return [self initWithUTF32String: string length: of_string_utf32_length(string) byteOrder: byteOrder]; } -- initWithUTF32String: (const of_char32_t*)string +- initWithUTF32String: (const of_char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { OF_INVALID_INIT_METHOD } -- initWithFormat: (OFConstantString*)format, ... +- initWithFormat: (OFConstantString *)format, ... { id ret; va_list arguments; va_start(arguments, format); @@ -906,24 +906,24 @@ va_end(arguments); return ret; } -- initWithFormat: (OFConstantString*)format +- initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } #ifdef OF_HAVE_FILES -- initWithContentsOfFile: (OFString*)path +- initWithContentsOfFile: (OFString *)path { return [self initWithContentsOfFile: path encoding: OF_STRING_ENCODING_UTF_8]; } -- initWithContentsOfFile: (OFString*)path +- initWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding { char *tmp; of_stat_t st; @@ -967,17 +967,17 @@ return self; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) -- initWithContentsOfURL: (OFURL*)URL +- initWithContentsOfURL: (OFURL *)URL { return [self initWithContentsOfURL: URL encoding: OF_STRING_ENCODING_AUTODETECT]; } -- initWithContentsOfURL: (OFURL*)URL +- initWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { void *pool; OFString *scheme; # ifdef OF_HAVE_FILES @@ -1019,11 +1019,11 @@ return self; } #endif -- initWithSerialization: (OFXMLElement*)element +- initWithSerialization: (OFXMLElement *)element { @try { void *pool = objc_autoreleasePoolPush(); if (![[element namespace] isEqual: OF_SERIALIZATION_NS]) @@ -1046,11 +1046,11 @@ } return self; } -- (size_t)OF_getCString: (char*)cString +- (size_t)OF_getCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding lossy: (bool)lossy { const of_unichar_t *characters = [self characters]; @@ -1134,11 +1134,11 @@ case OF_STRING_ENCODING_ISO_8859_2: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_iso_8859_2(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1147,11 +1147,11 @@ case OF_STRING_ENCODING_ISO_8859_3: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_iso_8859_3(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1160,11 +1160,11 @@ case OF_STRING_ENCODING_ISO_8859_15: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_iso_8859_15(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1173,11 +1173,11 @@ case OF_STRING_ENCODING_WINDOWS_1251: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_windows_1251(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1186,11 +1186,11 @@ case OF_STRING_ENCODING_WINDOWS_1252: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_windows_1252(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1199,11 +1199,11 @@ case OF_STRING_ENCODING_CODEPAGE_437: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_codepage_437(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1212,11 +1212,11 @@ case OF_STRING_ENCODING_CODEPAGE_850: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_codepage_850(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1225,11 +1225,11 @@ case OF_STRING_ENCODING_CODEPAGE_858: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_codepage_858(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1238,11 +1238,11 @@ case OF_STRING_ENCODING_MAC_ROMAN: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_mac_roman(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1251,11 +1251,11 @@ case OF_STRING_ENCODING_KOI8_R: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_koi8_r(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1264,11 +1264,11 @@ case OF_STRING_ENCODING_KOI8_U: if (length + 1 > maxLength) @throw [OFOutOfRangeException exception]; if (!of_unicode_to_koi8_u(characters, - (unsigned char*)cString, length, lossy)) + (unsigned char *)cString, length, lossy)) @throw [OFInvalidEncodingException exception]; cString[length] = '\0'; return length; @@ -1277,32 +1277,32 @@ @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; } } -- (size_t)getCString: (char*)cString +- (size_t)getCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding { return [self OF_getCString: cString maxLength: maxLength encoding: encoding lossy: false]; } -- (size_t)getLossyCString: (char*)cString +- (size_t)getLossyCString: (char *)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding { return [self OF_getCString: cString maxLength: maxLength encoding: encoding lossy: true]; } -- (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding - lossy: (bool)lossy +- (const char *)OF_cStringWithEncoding: (of_string_encoding_t)encoding + lossy: (bool)lossy { OFObject *object = [[[OFObject alloc] init] autorelease]; size_t length = [self length]; char *cString; @@ -1351,23 +1351,23 @@ } return cString; } -- (const char*)cStringWithEncoding: (of_string_encoding_t)encoding +- (const char *)cStringWithEncoding: (of_string_encoding_t)encoding { return [self OF_cStringWithEncoding: encoding lossy: false]; } -- (const char*)lossyCStringWithEncoding: (of_string_encoding_t)encoding +- (const char *)lossyCStringWithEncoding: (of_string_encoding_t)encoding { return [self OF_cStringWithEncoding: encoding lossy: true]; } -- (const char*)UTF8String +- (const char *)UTF8String { return [self cStringWithEncoding: OF_STRING_ENCODING_UTF_8]; } - (size_t)length @@ -1424,11 +1424,11 @@ - (of_unichar_t)characterAtIndex: (size_t)index { OF_UNRECOGNIZED_SELECTOR } -- (void)getCharacters: (of_unichar_t*)buffer +- (void)getCharacters: (of_unichar_t *)buffer inRange: (of_range_t)range { for (size_t i = 0; i < range.length; i++) buffer[i] = [self characterAtIndex: range.location + i]; } @@ -1489,11 +1489,11 @@ return OF_ORDERED_SAME; if (![object isKindOfClass: [OFString class]]) @throw [OFInvalidArgumentException exception]; - otherString = (OFString*)object; + otherString = (OFString *)object; minimumLength = ([self length] > [otherString length] ? [otherString length] : [self length]); pool = objc_autoreleasePoolPush(); @@ -1520,11 +1520,11 @@ return OF_ORDERED_ASCENDING; return OF_ORDERED_SAME; } -- (of_comparison_result_t)caseInsensitiveCompare: (OFString*)otherString +- (of_comparison_result_t)caseInsensitiveCompare: (OFString *)otherString { void *pool = objc_autoreleasePoolPush(); const of_unichar_t *characters, *otherCharacters; size_t length, otherLength, minimumLength; @@ -1601,16 +1601,16 @@ OF_HASH_FINALIZE(hash); return hash; } -- (OFString*)description +- (OFString *)description { return [[self copy] autorelease]; } -- (OFXMLElement*)XMLElementBySerializing +- (OFXMLElement *)XMLElementBySerializing { void *pool = objc_autoreleasePoolPush(); OFXMLElement *element; OFString *className; @@ -1628,24 +1628,24 @@ objc_autoreleasePoolPop(pool); return [element autorelease]; } -- (OFString*)JSONRepresentation +- (OFString *)JSONRepresentation { return [self OF_JSONRepresentationWithOptions: 0 depth: 0]; } -- (OFString*)JSONRepresentationWithOptions: (int)options +- (OFString *)JSONRepresentationWithOptions: (int)options { return [self OF_JSONRepresentationWithOptions: options depth: 0]; } -- (OFString*)OF_JSONRepresentationWithOptions: (int)options - depth: (size_t)depth +- (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: @"\\" @@ -1689,11 +1689,11 @@ [JSON makeImmutable]; return JSON; } -- (OFDataArray*)messagePackRepresentation +- (OFDataArray *)messagePackRepresentation { OFDataArray *data; size_t length; length = [self UTF8StringLength]; @@ -1741,26 +1741,26 @@ count: length]; return data; } -- (of_range_t)rangeOfString: (OFString*)string +- (of_range_t)rangeOfString: (OFString *)string { return [self rangeOfString: string options: 0 range: of_range(0, [self length])]; } -- (of_range_t)rangeOfString: (OFString*)string +- (of_range_t)rangeOfString: (OFString *)string options: (int)options { return [self rangeOfString: string options: options range: of_range(0, [self length])]; } -- (of_range_t)rangeOfString: (OFString*)string +- (of_range_t)rangeOfString: (OFString *)string options: (int)options range: (of_range_t)range { void *pool; const of_unichar_t *searchCharacters; @@ -1820,11 +1820,11 @@ objc_autoreleasePoolPop(pool); return of_range(OF_NOT_FOUND, 0); } -- (bool)containsString: (OFString*)string +- (bool)containsString: (OFString *)string { void *pool; const of_unichar_t *characters, *searchCharacters; size_t length, searchLength; @@ -1850,11 +1850,11 @@ objc_autoreleasePoolPop(pool); return false; } -- (OFString*)substringWithRange: (of_range_t)range +- (OFString *)substringWithRange: (of_range_t)range { void *pool; OFString *ret; if (range.length > SIZE_MAX - range.location || @@ -1868,11 +1868,11 @@ objc_autoreleasePoolPop(pool); return [ret autorelease]; } -- (OFString*)stringByAppendingString: (OFString*)string +- (OFString *)stringByAppendingString: (OFString *)string { OFMutableString *new; new = [OFMutableString stringWithString: self]; [new appendString: string]; @@ -1880,11 +1880,11 @@ [new makeImmutable]; return new; } -- (OFString*)stringByAppendingFormat: (OFConstantString*)format, ... +- (OFString *)stringByAppendingFormat: (OFConstantString *)format, ... { OFString *ret; va_list arguments; va_start(arguments, format); @@ -1893,12 +1893,12 @@ va_end(arguments); return ret; } -- (OFString*)stringByAppendingFormat: (OFConstantString*)format - arguments: (va_list)arguments +- (OFString *)stringByAppendingFormat: (OFConstantString *)format + arguments: (va_list)arguments { OFMutableString *new; new = [OFMutableString stringWithString: self]; [new appendFormat: format @@ -1907,11 +1907,11 @@ [new makeImmutable]; return new; } -- (OFString*)stringByAppendingPathComponent: (OFString*)component +- (OFString *)stringByAppendingPathComponent: (OFString *)component { void *pool = objc_autoreleasePoolPush(); OFString *ret; ret = [OFString pathWithComponents: @@ -1920,11 +1920,11 @@ [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } -- (OFString*)stringByPrependingString: (OFString*)string +- (OFString *)stringByPrependingString: (OFString *)string { OFMutableString *new = [[string mutableCopy] autorelease]; [new appendString: self]; @@ -1931,12 +1931,12 @@ [new makeImmutable]; return new; } -- (OFString*)stringByReplacingOccurrencesOfString: (OFString*)string - withString: (OFString*)replacement +- (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string + withString: (OFString *)replacement { OFMutableString *new = [[self mutableCopy] autorelease]; [new replaceOccurrencesOfString: string withString: replacement]; @@ -1944,14 +1944,14 @@ [new makeImmutable]; return new; } -- (OFString*)stringByReplacingOccurrencesOfString: (OFString*)string - withString: (OFString*)replacement - options: (int)options - range: (of_range_t)range +- (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 @@ -1961,11 +1961,11 @@ [new makeImmutable]; return new; } -- (OFString*)uppercaseString +- (OFString *)uppercaseString { OFMutableString *new = [[self mutableCopy] autorelease]; [new uppercase]; @@ -1972,11 +1972,11 @@ [new makeImmutable]; return new; } -- (OFString*)lowercaseString +- (OFString *)lowercaseString { OFMutableString *new = [[self mutableCopy] autorelease]; [new lowercase]; @@ -1983,11 +1983,11 @@ [new makeImmutable]; return new; } -- (OFString*)capitalizedString +- (OFString *)capitalizedString { OFMutableString *new = [[self mutableCopy] autorelease]; [new capitalize]; @@ -1994,11 +1994,11 @@ [new makeImmutable]; return new; } -- (OFString*)stringByDeletingLeadingWhitespaces +- (OFString *)stringByDeletingLeadingWhitespaces { OFMutableString *new = [[self mutableCopy] autorelease]; [new deleteLeadingWhitespaces]; @@ -2005,11 +2005,11 @@ [new makeImmutable]; return new; } -- (OFString*)stringByDeletingTrailingWhitespaces +- (OFString *)stringByDeletingTrailingWhitespaces { OFMutableString *new = [[self mutableCopy] autorelease]; [new deleteTrailingWhitespaces]; @@ -2016,11 +2016,11 @@ [new makeImmutable]; return new; } -- (OFString*)stringByDeletingEnclosingWhitespaces +- (OFString *)stringByDeletingEnclosingWhitespaces { OFMutableString *new = [[self mutableCopy] autorelease]; [new deleteEnclosingWhitespaces]; @@ -2027,11 +2027,11 @@ [new makeImmutable]; return new; } -- (bool)hasPrefix: (OFString*)prefix +- (bool)hasPrefix: (OFString *)prefix { of_unichar_t *tmp; const of_unichar_t *prefixCharacters; size_t prefixLength; bool hasPrefix; @@ -2057,11 +2057,11 @@ } return hasPrefix; } -- (bool)hasSuffix: (OFString*)suffix +- (bool)hasSuffix: (OFString *)suffix { of_unichar_t *tmp; const of_unichar_t *suffixCharacters; size_t length, suffixLength; bool hasSuffix; @@ -2090,18 +2090,18 @@ } return hasSuffix; } -- (OFArray*)componentsSeparatedByString: (OFString*)delimiter +- (OFArray *)componentsSeparatedByString: (OFString *)delimiter { return [self componentsSeparatedByString: delimiter options: 0]; } -- (OFArray*)componentsSeparatedByString: (OFString*)delimiter - options: (int)options +- (OFArray *)componentsSeparatedByString: (OFString *)delimiter + options: (int)options { void *pool; OFMutableArray *array = [OFMutableArray array]; const of_unichar_t *characters, *delimiterCharacters; bool skipEmpty = (options & OF_STRING_SKIP_EMPTY); @@ -2146,11 +2146,11 @@ objc_autoreleasePoolPop(pool); return array; } -- (OFArray*)pathComponents +- (OFArray *)pathComponents { OFMutableArray *ret; void *pool; const of_unichar_t *characters; size_t i, last = 0, length = [self length]; @@ -2194,11 +2194,11 @@ objc_autoreleasePoolPop(pool); return ret; } -- (OFString*)lastPathComponent +- (OFString *)lastPathComponent { void *pool; const of_unichar_t *characters; size_t length = [self length]; ssize_t i; @@ -2239,11 +2239,11 @@ i = 0; return [self substringWithRange: of_range(i, length - i)]; } -- (OFString*)pathExtension +- (OFString *)pathExtension { void *pool = objc_autoreleasePoolPush(); OFString *ret, *fileName; size_t pos; @@ -2259,11 +2259,11 @@ [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } -- (OFString*)stringByDeletingLastPathComponent +- (OFString *)stringByDeletingLastPathComponent { void *pool; const of_unichar_t *characters; size_t length = [self length]; @@ -2297,11 +2297,11 @@ objc_autoreleasePoolPop(pool); return OF_PATH_CURRENT_DIRECTORY; } -- (OFString*)stringByDeletingPathExtension +- (OFString *)stringByDeletingPathExtension { void *pool; OFMutableArray *components; OFString *ret, *fileName; size_t pos; @@ -2329,18 +2329,18 @@ [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } -- (OFString*)stringByStandardizingPath +- (OFString *)stringByStandardizingPath { return standardizePath([self pathComponents], OF_PATH_CURRENT_DIRECTORY, OF_PATH_PARENT_DIRECTORY, OF_PATH_DELIMITER_STRING); } -- (OFString*)stringByStandardizingURLPath +- (OFString *)stringByStandardizingURLPath { return standardizePath([self componentsSeparatedByString: @"/"], @".", @"..", @"/"); } @@ -2597,11 +2597,11 @@ objc_autoreleasePoolPop(pool); return value; } -- (const of_unichar_t*)characters +- (const of_unichar_t *)characters { OFObject *object = [[[OFObject alloc] init] autorelease]; size_t length = [self length]; of_unichar_t *ret; @@ -2611,16 +2611,16 @@ inRange: of_range(0, length)]; return ret; } -- (const of_char16_t*)UTF16String +- (const of_char16_t *)UTF16String { return [self UTF16StringWithByteOrder: OF_BYTE_ORDER_NATIVE]; } -- (const of_char16_t*)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder +- (const of_char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder { OFObject *object = [[[OFObject alloc] init] autorelease]; void *pool = objc_autoreleasePoolPush(); const of_unichar_t *characters = [self characters]; size_t length = [self length]; @@ -2682,16 +2682,16 @@ UTF16StringLength++; return UTF16StringLength; } -- (const of_char32_t*)UTF32String +- (const of_char32_t *)UTF32String { return [self UTF32StringWithByteOrder: OF_BYTE_ORDER_NATIVE]; } -- (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]; size_t length = [self length]; of_char32_t *ret; @@ -2707,17 +2707,17 @@ return ret; } #ifdef OF_HAVE_FILES -- (void)writeToFile: (OFString*)path +- (void)writeToFile: (OFString *)path { [self writeToFile: path encoding: OF_STRING_ENCODING_UTF_8]; } -- (void)writeToFile: (OFString*)path +- (void)writeToFile: (OFString *)path encoding: (of_string_encoding_t)encoding { void *pool = objc_autoreleasePoolPush(); OFFile *file;