@@ -61,18 +61,18 @@ _OFString_XMLEscaping_reference = 1; _OFString_XMLUnescaping_reference = 1; }; static inline int -memcasecmp(const char *s1, const char *s2, size_t len) +memcasecmp(const char *first, const char *second, size_t len) { size_t i; for (i = 0; i < len; i++) { - if (tolower((int)s1[i]) > tolower((int)s2[i])) + if (tolower((int)first[i]) > tolower((int)second[i])) return OF_ORDERED_DESCENDING; - if (tolower((int)s1[i]) < tolower((int)s2[i])) + if (tolower((int)first[i]) < tolower((int)second[i])) return OF_ORDERED_ASCENDING; } return OF_ORDERED_SAME; } @@ -244,67 +244,67 @@ + string { return [[[self alloc] init] autorelease]; } -+ stringWithCString: (const char*)str -{ - return [[[self alloc] initWithCString: str] autorelease]; -} - -+ stringWithCString: (const char*)str - encoding: (of_string_encoding_t)encoding -{ - return [[[self alloc] initWithCString: str - encoding: encoding] autorelease]; -} - -+ stringWithCString: (const char*)str - encoding: (of_string_encoding_t)encoding - length: (size_t)len -{ - return [[[self alloc] initWithCString: str - encoding: encoding - length: len] autorelease]; -} - -+ stringWithCString: (const char*)str - length: (size_t)len -{ - return [[[self alloc] initWithCString: str - length: len] autorelease]; -} - -+ stringWithFormat: (OFString*)fmt, ... -{ - id ret; - va_list args; - - va_start(args, fmt); - ret = [[[self alloc] initWithFormat: fmt - arguments: args] autorelease]; - va_end(args); - - return ret; -} - -+ stringWithPath: (OFString*)first, ... -{ - id ret; - va_list args; - - va_start(args, first); - ret = [[[self alloc] initWithPath: first - arguments: args] autorelease]; - va_end(args); - - return ret; -} - -+ stringWithString: (OFString*)str -{ - return [[[self alloc] initWithString: str] autorelease]; ++ stringWithCString: (const char*)string +{ + return [[[self alloc] initWithCString: string] autorelease]; +} + ++ stringWithCString: (const char*)string + encoding: (of_string_encoding_t)encoding +{ + return [[[self alloc] initWithCString: string + encoding: encoding] autorelease]; +} + ++ stringWithCString: (const char*)string + encoding: (of_string_encoding_t)encoding + length: (size_t)length +{ + return [[[self alloc] initWithCString: string + encoding: encoding + length: length] autorelease]; +} + ++ stringWithCString: (const char*)string + length: (size_t)length +{ + return [[[self alloc] initWithCString: string + length: length] autorelease]; +} + ++ stringWithFormat: (OFString*)format, ... +{ + id ret; + va_list arguments; + + va_start(arguments, format); + ret = [[[self alloc] initWithFormat: format + arguments: arguments] autorelease]; + va_end(arguments); + + return ret; +} + ++ stringWithPath: (OFString*)firstComponent, ... +{ + id ret; + va_list arguments; + + va_start(arguments, firstComponent); + ret = [[[self alloc] initWithPath: firstComponent + arguments: arguments] autorelease]; + va_end(arguments); + + return ret; +} + ++ stringWithString: (OFString*)string +{ + return [[[self alloc] initWithString: string] autorelease]; } + stringWithContentsOfFile: (OFString*)path { return [[[self alloc] initWithContentsOfFile: path] autorelease]; @@ -315,19 +315,19 @@ { return [[[self alloc] initWithContentsOfFile: path encoding: encoding] autorelease]; } -+ stringWithContentsOfURL: (OFURL*)url ++ stringWithContentsOfURL: (OFURL*)URL { - return [[[self alloc] initWithContentsOfURL: url] autorelease]; + return [[[self alloc] initWithContentsOfURL: URL] autorelease]; } -+ stringWithContentsOfURL: (OFURL*)url ++ stringWithContentsOfURL: (OFURL*)URL encoding: (of_string_encoding_t)encoding { - return [[[self alloc] initWithContentsOfURL: url + return [[[self alloc] initWithContentsOfURL: URL encoding: encoding] autorelease]; } - init { @@ -342,73 +342,73 @@ } return self; } -- initWithCString: (const char*)str +- initWithCString: (const char*)string_ { - return [self initWithCString: str + return [self initWithCString: string_ encoding: OF_STRING_ENCODING_UTF_8 - length: strlen(str)]; + length: strlen(string_)]; } -- initWithCString: (const char*)str +- initWithCString: (const char*)string_ encoding: (of_string_encoding_t)encoding { - return [self initWithCString: str + return [self initWithCString: string_ encoding: encoding - length: strlen(str)]; + length: strlen(string_)]; } -- initWithCString: (const char*)str +- initWithCString: (const char*)string_ encoding: (of_string_encoding_t)encoding - length: (size_t)len + length: (size_t)length_ { self = [super init]; @try { size_t i, j; const uint16_t *table; if (encoding == OF_STRING_ENCODING_UTF_8 && - len >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) { - str += 3; - len -= 3; + length_ >= 3 && !memcmp(string_, "\xEF\xBB\xBF", 3)) { + string_ += 3; + length_ -= 3; } - string = [self allocMemoryWithSize: len + 1]; - length = len; + string = [self allocMemoryWithSize: length_ + 1]; + length = length_; if (encoding == OF_STRING_ENCODING_UTF_8) { - switch (of_string_check_utf8(str, length)) { + switch (of_string_check_utf8(string_, length)) { case 1: isUTF8 = YES; break; case -1: @throw [OFInvalidEncodingException newWithClass: isa]; } - memcpy(string, str, length); + memcpy(string, string_, length); string[length] = 0; return self; } if (encoding == OF_STRING_ENCODING_ISO_8859_1) { - for (i = j = 0; i < len; i++) { + for (i = j = 0; i < length_; i++) { char buf[4]; size_t bytes; - if (!(str[i] & 0x80)) { - string[j++] = str[i]; + if (!(string_[i] & 0x80)) { + string[j++] = string_[i]; continue; } isUTF8 = YES; bytes = of_string_unicode_to_utf8( - (uint8_t)str[i], buf); + (uint8_t)string_[i], buf); if (bytes == 0) @throw [OFInvalidEncodingException newWithClass: isa]; @@ -434,39 +434,40 @@ break; default: @throw [OFInvalidEncodingException newWithClass: isa]; } - for (i = j = 0; i < len; i++) { + for (i = j = 0; i < length_; i++) { char buf[4]; - of_unichar_t chr; - size_t chr_bytes; + of_unichar_t character; + size_t characterBytes; - if (!(str[i] & 0x80)) { - string[j++] = str[i]; + if (!(string_[i] & 0x80)) { + string[j++] = string_[i]; continue; } - chr = table[(uint8_t)str[i]]; + character = table[(uint8_t)string_[i]]; - if (chr == 0xFFFD) + if (character == 0xFFFD) @throw [OFInvalidEncodingException newWithClass: isa]; isUTF8 = YES; - chr_bytes = of_string_unicode_to_utf8(chr, buf); + characterBytes = of_string_unicode_to_utf8(character, + buf); - if (chr_bytes == 0) + if (characterBytes == 0) @throw [OFInvalidEncodingException newWithClass: isa]; - length += chr_bytes - 1; + length += characterBytes - 1; string = [self resizeMemory: string toSize: length + 1]; - memcpy(string + j, buf, chr_bytes); - j += chr_bytes; + memcpy(string + j, buf, characterBytes); + j += characterBytes; } string[length] = 0; } @catch (id e) { [self release]; @@ -474,44 +475,45 @@ } return self; } -- initWithCString: (const char*)str - length: (size_t)len +- initWithCString: (const char*)string_ + length: (size_t)length_ { - return [self initWithCString: str + return [self initWithCString: string_ encoding: OF_STRING_ENCODING_UTF_8 - length: len]; + length: length_]; } -- initWithFormat: (OFString*)fmt, ... +- initWithFormat: (OFString*)format, ... { id ret; - va_list args; + va_list arguments; - va_start(args, fmt); - ret = [self initWithFormat: fmt - arguments: args]; - va_end(args); + va_start(arguments, format); + ret = [self initWithFormat: format + arguments: arguments]; + va_end(arguments); return ret; } -- initWithFormat: (OFString*)fmt - arguments: (va_list)args +- initWithFormat: (OFString*)format + arguments: (va_list)arguments { self = [super init]; @try { int len; - if (fmt == nil) + if (format == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; - if ((len = of_vasprintf(&string, [fmt cString], args)) == -1) + if ((len = of_vasprintf(&string, [format cString], + arguments)) == -1) @throw [OFInvalidFormatException newWithClass: isa]; @try { length = len; @@ -534,46 +536,47 @@ } return self; } -- initWithPath: (OFString*)first, ... +- initWithPath: (OFString*)firstComponent, ... { id ret; - va_list args; + va_list arguments; - va_start(args, first); - ret = [self initWithPath: first - arguments: args]; - va_end(args); + va_start(arguments, firstComponent); + ret = [self initWithPath: firstComponent + arguments: arguments]; + va_end(arguments); return ret; } -- initWithPath: (OFString*)first - arguments: (va_list)args +- initWithPath: (OFString*)firstComponent + arguments: (va_list)arguments { self = [super init]; @try { OFString *component; size_t len, i; - va_list args2; + va_list argumentsCopy; - length = [first cStringLength]; + length = [firstComponent cStringLength]; - switch (of_string_check_utf8([first cString], length)) { + switch (of_string_check_utf8([firstComponent cString], + length)) { case 1: isUTF8 = YES; break; case -1: @throw [OFInvalidEncodingException newWithClass: isa]; } /* Calculate length */ - va_copy(args2, args); - while ((component = va_arg(args2, OFString*)) != nil) { + va_copy(argumentsCopy, arguments); + while ((component = va_arg(argumentsCopy, OFString*)) != nil) { len = [component cStringLength]; length += 1 + len; switch (of_string_check_utf8([component cString], len)) { @@ -586,15 +589,15 @@ } } string = [self allocMemoryWithSize: length + 1]; - len = [first cStringLength]; - memcpy(string, [first cString], len); + len = [firstComponent cStringLength]; + memcpy(string, [firstComponent cString], len); i = len; - while ((component = va_arg(args, OFString*)) != nil) { + while ((component = va_arg(arguments, OFString*)) != nil) { len = [component cStringLength]; string[i] = OF_PATH_DELIM; memcpy(string + i + 1, [component cString], len); i += len + 1; } @@ -606,18 +609,18 @@ } return self; } -- initWithString: (OFString*)str +- initWithString: (OFString*)string_ { self = [super init]; @try { /* We have no -[dealloc], so this is ok */ - string = (char*)[str cString]; - length = [str cStringLength]; + string = (char*)[string_ cString]; + length = [string_ cStringLength]; switch (of_string_check_utf8(string, length)) { case 1: isUTF8 = YES; break; @@ -688,49 +691,49 @@ [self freeMemory: tmp]; return self; } -- initWithContentsOfURL: (OFURL*)url +- initWithContentsOfURL: (OFURL*)URL { - return [self initWithContentsOfURL: url + return [self initWithContentsOfURL: URL encoding: OF_STRING_ENCODING_UTF_8]; } -- initWithContentsOfURL: (OFURL*)url +- initWithContentsOfURL: (OFURL*)URL encoding: (of_string_encoding_t)encoding { OFAutoreleasePool *pool; - OFHTTPRequest *req; - OFHTTPRequestResult *res; + OFHTTPRequest *request; + OFHTTPRequestResult *result; Class c; c = isa; [self release]; self = nil; pool = [[OFAutoreleasePool alloc] init]; - if ([[url scheme] isEqual: @"file"]) { - self = [[c alloc] initWithContentsOfFile: [url path] + if ([[URL scheme] isEqual: @"file"]) { + self = [[c alloc] initWithContentsOfFile: [URL path] encoding: encoding]; [pool release]; return self; } - req = [OFHTTPRequest requestWithURL: url]; - res = [req perform]; + request = [OFHTTPRequest requestWithURL: URL]; + result = [request perform]; - if ([res statusCode] != 200) + if ([result statusCode] != 200) @throw [OFHTTPRequestFailedException - newWithClass: [req class] - HTTPRequest: req - statusCode: [res statusCode]]; + newWithClass: [request class] + HTTPRequest: request + statusCode: [result statusCode]]; - self = [[c alloc] initWithCString: (char*)[[res data] cArray] + self = [[c alloc] initWithCString: (char*)[[result data] cArray] encoding: encoding - length: [[res data] count]]; + length: [[result data] count]]; [pool release]; return self; } - (const char*)cString @@ -753,15 +756,20 @@ - (BOOL)isUTF8 { return isUTF8; } -- (BOOL)isEqual: (id)obj +- (BOOL)isEqual: (id)object { - if (![obj isKindOfClass: [OFString class]]) + OFString *otherString; + + if (![object isKindOfClass: [OFString class]]) return NO; - if (strcmp(string, [(OFString*)obj cString])) + + otherString = (OFString*)object; + + if (strcmp(string, [otherString cString])) return NO; return YES; } @@ -773,26 +781,29 @@ - mutableCopy { return [[OFMutableString alloc] initWithString: self]; } -- (of_comparison_result_t)compare: (id)obj +- (of_comparison_result_t)compare: (id)object { - size_t str_len, min_len; + OFString *otherString; + size_t otherLen, minLen; int cmp; - if (![obj isKindOfClass: [OFString class]]) + if (![object isKindOfClass: [OFString class]]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; - str_len = [(OFString*)obj cStringLength]; - min_len = (length > str_len ? str_len : length); + otherString = (OFString*)object; - if ((cmp = memcmp(string, [(OFString*)obj cString], min_len)) == 0) { - if (length > str_len) + otherLen = [otherString cStringLength]; + minLen = (length > otherLen ? otherLen : length); + + if ((cmp = memcmp(string, [otherString cString], minLen)) == 0) { + if (length > otherLen) return OF_ORDERED_DESCENDING; - if (length < str_len) + if (length < otherLen) return OF_ORDERED_ASCENDING; return OF_ORDERED_SAME; } if (cmp > 0) @@ -799,30 +810,30 @@ return OF_ORDERED_DESCENDING; else return OF_ORDERED_ASCENDING; } -- (of_comparison_result_t)caseInsensitiveCompare: (OFString*)str +- (of_comparison_result_t)caseInsensitiveCompare: (OFString*)otherString; { - const char *str_cstr; - size_t i, j, str_len, min_len; + const char *otherCString; + size_t i, j, otherLen, minLen; int cmp; - if (![str isKindOfClass: [OFString class]]) + if (![otherString isKindOfClass: [OFString class]]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; - str_cstr = [str cString]; - str_len = [str cStringLength]; + otherCString = [otherString cString]; + otherLen = [otherString cStringLength]; if (![self isUTF8]) { - min_len = (length > str_len ? str_len : length); + minLen = (length > otherLen ? otherLen : length); - if ((cmp = memcasecmp(string, [str cString], min_len)) == 0) { - if (length > str_len) + if ((cmp = memcasecmp(string, otherCString, minLen)) == 0) { + if (length > otherLen) return OF_ORDERED_DESCENDING; - if (length < str_len) + if (length < otherLen) return OF_ORDERED_ASCENDING; return OF_ORDERED_SAME; } if (cmp > 0) @@ -831,16 +842,17 @@ return OF_ORDERED_ASCENDING; } i = j = 0; - while (i < length && j < str_len) { + while (i < length && j < otherLen) { of_unichar_t c1, c2; size_t l1, l2; l1 = of_string_utf8_to_unicode(string + i, length - i, &c1); - l2 = of_string_utf8_to_unicode(str_cstr + j, str_len - j, &c2); + l2 = of_string_utf8_to_unicode(otherCString + j, otherLen - j, + &c2); if (l1 == 0 || l2 == 0 || c1 > 0x10FFFF || c2 > 0x10FFFF) @throw [OFInvalidEncodingException newWithClass: isa]; if (c1 >> 8 < OF_UNICODE_CASEFOLDING_TABLE_SIZE) { @@ -866,13 +878,13 @@ i += l1; j += l2; } - if (length - i > str_len - j) + if (length - i > otherLen - j) return OF_ORDERED_DESCENDING; - else if (length - i < str_len - j) + else if (length - i < otherLen - j) return OF_ORDERED_ASCENDING; return OF_ORDERED_SAME; } @@ -914,65 +926,65 @@ @throw [OFInvalidEncodingException newWithClass: isa]; return c; } -- (size_t)indexOfFirstOccurrenceOfString: (OFString*)str +- (size_t)indexOfFirstOccurrenceOfString: (OFString*)string_ { - const char *str_c = [str cString]; - size_t str_len = [str cStringLength]; + const char *cString = [string_ cString]; + size_t stringLen = [string_ cStringLength]; size_t i; - if (str_len == 0) + if (stringLen == 0) return 0; - if (str_len > length) + if (stringLen > length) return OF_INVALID_INDEX; - for (i = 0; i <= length - str_len; i++) - if (!memcmp(string + i, str_c, str_len)) + for (i = 0; i <= length - stringLen; i++) + if (!memcmp(string + i, cString, stringLen)) return of_string_position_to_index(string, i); return OF_INVALID_INDEX; } -- (size_t)indexOfLastOccurrenceOfString: (OFString*)str +- (size_t)indexOfLastOccurrenceOfString: (OFString*)string_ { - const char *str_c = [str cString]; - size_t str_len = [str cStringLength]; + const char *cString = [string_ cString]; + size_t stringLen = [string_ cStringLength]; size_t i; - if (str_len == 0) + if (stringLen == 0) return of_string_position_to_index(string, length); - if (str_len > length) + if (stringLen > length) return OF_INVALID_INDEX; - for (i = length - str_len;; i--) { - if (!memcmp(string + i, str_c, str_len)) + for (i = length - stringLen;; i--) { + if (!memcmp(string + i, cString, stringLen)) return of_string_position_to_index(string, i); /* Did not match and we're at the last char */ if (i == 0) return OF_INVALID_INDEX; } } -- (BOOL)containsString: (OFString*)str +- (BOOL)containsString: (OFString*)string_ { - const char *str_c = [str cString]; - size_t str_len = [str cStringLength]; + const char *cString = [string_ cString]; + size_t stringLen = [string_ cStringLength]; size_t i; - if (str_len == 0) + if (stringLen == 0) return YES; - if (str_len > length) + if (stringLen > length) return NO; - for (i = 0; i <= length - str_len; i++) - if (!memcmp(string + i, str_c, str_len)) + for (i = 0; i <= length - stringLen; i++) + if (!memcmp(string + i, cString, stringLen)) return YES; return NO; } @@ -999,16 +1011,16 @@ { return [self substringFromIndex: range.start toIndex: range.start + range.length]; } -- (OFString*)stringByAppendingString: (OFString*)str +- (OFString*)stringByAppendingString: (OFString*)string_ { OFMutableString *new; new = [OFMutableString stringWithString: self]; - [new appendString: str]; + [new appendString: string_]; /* * Class swizzle the string to be immutable. We declared the return type * to be OFString*, so it can't be modified anyway. But not swizzling it * would create a real copy each time -[copy] is called. @@ -1088,30 +1100,30 @@ - (OFArray*)componentsSeparatedByString: (OFString*)delimiter { OFAutoreleasePool *pool; OFMutableArray *array; const char *delim = [delimiter cString]; - size_t delim_len = [delimiter cStringLength]; + size_t delimLen = [delimiter cStringLength]; size_t i, last; array = [OFMutableArray array]; pool = [[OFAutoreleasePool alloc] init]; - if (delim_len > length) { + if (delimLen > length) { [array addObject: [[self copy] autorelease]]; [pool release]; return array; } - for (i = 0, last = 0; i <= length - delim_len; i++) { - if (memcmp(string + i, delim, delim_len)) + for (i = 0, last = 0; i <= length - delimLen; i++) { + if (memcmp(string + i, delim, delimLen)) continue; [array addObject: [OFString stringWithCString: string + last length: i - last]]; - i += delim_len - 1; + i += delimLen - 1; last = i + 1; } [array addObject: [OFString stringWithCString: string + last]]; [pool release]; @@ -1127,27 +1139,27 @@ - (OFArray*)pathComponents { OFMutableArray *ret; OFAutoreleasePool *pool; - size_t i, last = 0, path_len = length; + size_t i, last = 0, pathLen = length; ret = [OFMutableArray array]; - if (path_len == 0) + if (pathLen == 0) return ret; pool = [[OFAutoreleasePool alloc] init]; #ifndef _WIN32 - if (string[path_len - 1] == OF_PATH_DELIM) + if (string[pathLen - 1] == OF_PATH_DELIM) #else - if (string[path_len - 1] == '/' || string[path_len - 1] == '\\') + if (string[pathLen - 1] == '/' || string[pathLen - 1] == '\\') #endif - path_len--; + pathLen--; - for (i = 0; i < path_len; i++) { + for (i = 0; i < pathLen; i++) { #ifndef _WIN32 if (string[i] == OF_PATH_DELIM) { #else if (string[i] == '/' || string[i] == '\\') { #endif @@ -1172,24 +1184,24 @@ return ret; } - (OFString*)lastPathComponent { - size_t path_len = length; + size_t pathLen = length; ssize_t i; - if (path_len == 0) + if (pathLen == 0) return @""; #ifndef _WIN32 - if (string[path_len - 1] == OF_PATH_DELIM) + if (string[pathLen - 1] == OF_PATH_DELIM) #else - if (string[path_len - 1] == '/' || string[path_len - 1] == '\\') + if (string[pathLen - 1] == '/' || string[pathLen - 1] == '\\') #endif - path_len--; + pathLen--; - for (i = path_len - 1; i >= 0; i--) { + for (i = pathLen - 1; i >= 0; i--) { #ifndef _WIN32 if (string[i] == OF_PATH_DELIM) { #else if (string[i] == '/' || string[i] == '\\') { #endif @@ -1204,32 +1216,32 @@ */ if (i < 0) i = 0; return [OFString stringWithCString: string + i - length: path_len - i]; + length: pathLen - i]; } - (OFString*)stringByDeletingLastPathComponent; { - size_t i, path_len = length; + size_t i, pathLen = length; - if (path_len == 0) + if (pathLen == 0) return @""; #ifndef _WIN32 - if (string[path_len - 1] == OF_PATH_DELIM) + if (string[pathLen - 1] == OF_PATH_DELIM) #else - if (string[path_len - 1] == '/' || string[path_len - 1] == '\\') + if (string[pathLen - 1] == '/' || string[pathLen - 1] == '\\') #endif - path_len--; + pathLen--; - if (path_len == 0) + if (pathLen == 0) return [OFString stringWithCString: string length: 1]; - for (i = path_len - 1; i >= 1; i--) + for (i = pathLen - 1; i >= 1; i--) #ifndef _WIN32 if (string[i] == OF_PATH_DELIM) #else if (string[i] == '/' || string[i] == '\\') #endif @@ -1353,24 +1365,24 @@ } - (float)floatValue { const char *str = string; - char *endptr; + char *endPtr; float value; /* Don't depend on isspace and thus the used locale */ while (*str == ' ' || *str == '\t' || *str == '\n' || *str == '\r') str++; - value = strtof(str, &endptr); + value = strtof(str, &endPtr); /* Check if there are any invalid chars left */ - if (endptr != NULL) { - for (; *endptr != '\0'; endptr++) - if (*endptr != ' ' && *endptr != '\t' && - *endptr != '\n' && *endptr != '\r') + if (endPtr != NULL) { + for (; *endPtr != '\0'; endPtr++) + if (*endPtr != ' ' && *endPtr != '\t' && + *endPtr != '\n' && *endPtr != '\r') @throw [OFInvalidFormatException newWithClass: isa]; } return value; @@ -1377,24 +1389,24 @@ } - (double)doubleValue { const char *str = string; - char *endptr; + char *endPtr; double value; /* Don't depend on isspace and thus the used locale */ while (*str == ' ' || *str == '\t' || *str == '\n' || *str == '\r') str++; - value = strtod(str, &endptr); + value = strtod(str, &endPtr); /* Check if there are any invalid chars left */ - if (endptr != NULL) { - for (; *endptr != '\0'; endptr++) - if (*endptr != ' ' && *endptr != '\t' && - *endptr != '\n' && *endptr != '\r') + if (endPtr != NULL) { + for (; *endPtr != '\0'; endPtr++) + if (*endPtr != ' ' && *endPtr != '\t' && + *endPtr != '\n' && *endPtr != '\r') @throw [OFInvalidFormatException newWithClass: isa]; } return value; @@ -1412,21 +1424,21 @@ i = j = 0; while (i < length) { of_unichar_t c; - size_t clen; + size_t cLen; - clen = of_string_utf8_to_unicode(string + i, length - 1, &c); + cLen = of_string_utf8_to_unicode(string + i, length - 1, &c); - if (clen == 0 || c > 0x10FFFF) { + if (cLen == 0 || c > 0x10FFFF) { free(ret); @throw [OFInvalidEncodingException newWithClass: isa]; } ret[j++] = c; - i += clen; + i += cLen; } ret[j] = 0; return ret;