@@ -55,21 +55,20 @@ static size_t parseArray(const uint8_t *buffer, size_t length, id *object, size_t count) { void *pool; - size_t i, pos; + size_t pos = 0; /* * Don't use capacity! For data and strings, this is safe, as we can * check if we still have enough bytes left. For an array however, we * can't know this, as every child can be more than one byte. */ *object = [OFMutableArray array]; - pos = 0; - for (i = 0; i < count; i++) { + for (size_t i = 0; i < count; i++) { id child; size_t childLength; pool = objc_autoreleasePoolPush(); @@ -92,21 +91,20 @@ static size_t parseTable(const uint8_t *buffer, size_t length, id *object, size_t count) { void *pool; - size_t i, pos; + size_t pos = 0; /* * Don't use capacity! For data and strings, this is safe, as we can * check if we still have enough bytes left. For a dictionary however, * we can't know this, as every key / value can be more than one byte. */ *object = [OFMutableDictionary dictionary]; - pos = 0; - for (i = 0; i < count; i++) { + for (size_t i = 0; i < count; i++) { id key, value; size_t keyLength, valueLength; pool = objc_autoreleasePoolPush(); @@ -138,11 +136,11 @@ } static size_t parseObject(const uint8_t *buffer, size_t length, id *object) { - size_t i, count; + size_t count; int8_t type; OFDataArray *data; if (length < 1) goto error; @@ -242,11 +240,11 @@ } f; if (length < 5) goto error; - for (i = 0; i < 4; i++) + for (size_t i = 0; i < 4; i++) f.u8[i] = buffer[i + 1]; *object = [OFNumber numberWithFloat: OF_BSWAP_FLOAT_IF_LE(f.f)]; return 5; case 0xCB:; /* float 64 */ @@ -256,11 +254,11 @@ } d; if (length < 9) goto error; - for (i = 0; i < 8; i++) + for (size_t i = 0; i < 8; i++) d.u8[i] = buffer[i + 1]; *object = [OFNumber numberWithDouble: OF_BSWAP_DOUBLE_IF_LE(d.d)]; return 9;