@@ -43,13 +43,11 @@ extern const of_char16_t of_codepage_437[128]; static inline int memcasecmp(const char *first, const char *second, size_t length) { - size_t i; - - for (i = 0; i < length; i++) { + for (size_t i = 0; i < length; i++) { if (tolower((int)first[i]) > tolower((int)second[i])) return OF_ORDERED_DESCENDING; if (tolower((int)first[i]) < tolower((int)second[i])) return OF_ORDERED_ASCENDING; } @@ -58,14 +56,14 @@ } int of_string_utf8_check(const char *UTF8String, size_t UTF8Length, size_t *length) { - size_t i, tmpLength = UTF8Length; + size_t tmpLength = UTF8Length; int isUTF8 = 0; - for (i = 0; i < UTF8Length; i++) { + for (size_t i = 0; i < UTF8Length; i++) { /* No sign of UTF-8 here */ if OF_LIKELY (!(UTF8String[i] & 0x80)) continue; isUTF8 = 1; @@ -125,25 +123,23 @@ } size_t of_string_utf8_get_index(const char *string, size_t position) { - size_t i, index = position; + size_t index = position; - for (i = 0; i < position; i++) + for (size_t i = 0; i < position; i++) if OF_UNLIKELY ((string[i] & 0xC0) == 0x80) index--; return index; } size_t of_string_utf8_get_position(const char *string, size_t index, size_t length) { - size_t i; - - for (i = 0; i <= index; i++) + for (size_t i = 0; i <= index; i++) if OF_UNLIKELY ((string[i] & 0xC0) == 0x80) if (++index > length) return OF_NOT_FOUND; return index; @@ -209,12 +205,12 @@ length: (size_t)cStringLength { self = [super init]; @try { - size_t i, j; const of_char16_t *table; + size_t j; if (encoding == OF_STRING_ENCODING_UTF_8 && cStringLength >= 3 && memcmp(cString, "\xEF\xBB\xBF", 3) == 0) { cString += 3; @@ -249,11 +245,12 @@ /* All other encodings we support are single byte encodings */ _s->length = cStringLength; if (encoding == OF_STRING_ENCODING_ISO_8859_1) { - for (i = j = 0; i < cStringLength; i++) { + j = 0; + for (size_t i = 0; i < cStringLength; i++) { char buffer[4]; size_t bytes; if (!(cString[i] & 0x80)) { _s->cString[j++] = cString[i]; @@ -294,11 +291,12 @@ break; default: @throw [OFInvalidEncodingException exception]; } - for (i = j = 0; i < cStringLength; i++) { + j = 0; + for (size_t i = 0; i < cStringLength; i++) { char buffer[4]; of_unichar_t character; size_t characterBytes; if (!(cString[i] & 0x80)) { @@ -405,18 +403,19 @@ length: (size_t)length { self = [super init]; @try { - size_t i, j = 0; + size_t j; _s = &_storage; _s->cString = [self allocMemoryWithSize: (length * 4) + 1]; _s->length = length; - for (i = 0; i < length; i++) { + j = 0; + for (size_t i = 0; i < length; i++) { size_t len = of_string_utf8_encode(characters[i], _s->cString + j); if (len == 0) @throw [OFInvalidEncodingException exception]; @@ -449,11 +448,11 @@ byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @try { - size_t i, j = 0; + size_t j; bool swap = false; if (length > 0 && *string == 0xFEFF) { string++; length--; @@ -467,11 +466,12 @@ _s = &_storage; _s->cString = [self allocMemoryWithSize: (length * 4) + 1]; _s->length = length; - for (i = 0; i < length; i++) { + j = 0; + for (size_t i = 0; i < length; i++) { of_unichar_t character = (swap ? OF_BSWAP16(string[i]) : string[i]); size_t len; /* Missing high surrogate */ @@ -533,11 +533,11 @@ byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @try { - size_t i, j = 0; + size_t j; bool swap = false; if (length > 0 && *characters == 0xFEFF) { characters++; length--; @@ -551,11 +551,12 @@ _s = &_storage; _s->cString = [self allocMemoryWithSize: (length * 4) + 1]; _s->length = length; - for (i = 0; i < length; i++) { + j = 0; + for (size_t i = 0; i < length; i++) { char buffer[4]; size_t len = of_string_utf8_encode( (swap ? OF_BSWAP32(characters[i]) : characters[i]), buffer); @@ -850,19 +851,18 @@ return OF_ORDERED_SAME; } - (uint32_t)hash { - size_t i; uint32_t hash; if (_s->hashed) return _s->hash; OF_HASH_INIT(hash); - for (i = 0; i < _s->cStringLength; i++) { + for (size_t i = 0; i < _s->cStringLength; i++) { of_unichar_t c; size_t length; if ((length = of_string_utf8_decode(_s->cString + i, _s->cStringLength - i, &c)) == 0) @@ -923,11 +923,11 @@ - (of_range_t)rangeOfString: (OFString*)string options: (int)options range: (of_range_t)range { const char *cString = [string UTF8String]; - size_t i, cStringLength = [string UTF8StringLength]; + size_t cStringLength = [string UTF8StringLength]; size_t rangeLocation, rangeLength; if (range.length > SIZE_MAX - range.location || range.location + range.length > _s->length) @throw [OFOutOfRangeException exception]; @@ -948,11 +948,11 @@ if (cStringLength > rangeLength) return of_range(OF_NOT_FOUND, 0); if (options & OF_STRING_SEARCH_BACKWARDS) { - for (i = rangeLength - cStringLength;; i--) { + for (size_t i = rangeLength - cStringLength;; i--) { if (memcmp(_s->cString + rangeLocation + i, cString, cStringLength) == 0) { range.location += of_string_utf8_get_index( _s->cString + rangeLocation, i); range.length = [string length]; @@ -963,11 +963,11 @@ /* Did not match and we're at the last char */ if (i == 0) return of_range(OF_NOT_FOUND, 0); } } else { - for (i = 0; i <= rangeLength - cStringLength; i++) { + for (size_t i = 0; i <= rangeLength - cStringLength; i++) { if (memcmp(_s->cString + rangeLocation + i, cString, cStringLength) == 0) { range.location += of_string_utf8_get_index( _s->cString + rangeLocation, i); range.length = [string length]; @@ -981,19 +981,19 @@ } - (bool)containsString: (OFString*)string { const char *cString = [string UTF8String]; - size_t i, cStringLength = [string UTF8StringLength]; + size_t cStringLength = [string UTF8StringLength]; if (cStringLength == 0) return true; if (cStringLength > _s->cStringLength) return false; - for (i = 0; i <= _s->cStringLength - cStringLength; i++) + for (size_t i = 0; i <= _s->cStringLength - cStringLength; i++) if (memcmp(_s->cString + i, cString, cStringLength) == 0) return true; return false; } @@ -1044,11 +1044,11 @@ void *pool; OFMutableArray *array; const char *cString = [delimiter UTF8String]; size_t cStringLength = [delimiter UTF8StringLength]; bool skipEmpty = (options & OF_STRING_SKIP_EMPTY); - size_t i, last; + size_t last; OFString *component; array = [OFMutableArray array]; pool = objc_autoreleasePoolPush(); @@ -1057,11 +1057,12 @@ objc_autoreleasePoolPop(pool); return array; } - for (i = 0, last = 0; i <= _s->cStringLength - cStringLength; i++) { + last = 0; + for (size_t i = 0; i <= _s->cStringLength - cStringLength; i++) { if (memcmp(_s->cString + i, cString, cStringLength) != 0) continue; component = [OFString stringWithUTF8String: _s->cString + last length: i - last]; @@ -1152,11 +1153,11 @@ length: pathCStringLength - i]; } - (OFString*)stringByDeletingLastPathComponent { - size_t i, pathCStringLength = _s->cStringLength; + size_t pathCStringLength = _s->cStringLength; if (pathCStringLength == 0) return @""; if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1])) @@ -1164,11 +1165,11 @@ if (pathCStringLength == 0) return [OFString stringWithUTF8String: _s->cString length: 1]; - for (i = pathCStringLength - 1; i >= 1; i--) + for (size_t i = pathCStringLength - 1; i >= 1; i--) if (OF_IS_PATH_DELIMITER(_s->cString[i])) return [OFString stringWithUTF8String: _s->cString length: i]; if (OF_IS_PATH_DELIMITER(_s->cString[0]))