Differences From Artifact [b5e5e4f9e4]:
- File
src/OFZIPArchive.m
— part of check-in
[d3158d091f]
at
2016-01-05 22:00:03
on branch trunk
— (u)int_fast*_t -> (u)int*_t
(U)INT_FAST*_MAX is broken on Android, which makes (u)int_fast*_t
dangerous to use while it does not provide any real speed benefit. (user: js, size: 14025) [annotate] [blame] [check-ins using]
To Artifact [8e1e5b444d]:
- File src/OFZIPArchive.m — part of check-in [e0b9167693] at 2016-02-21 15:37:42 on branch trunk — Make use of C99-style for loops (user: js, size: 14002) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
82 83 84 85 86 87 88 |
localFileHeader: (OFZIPArchive_LocalFileHeader*)localFileHeader;
@end
uint32_t
of_zip_archive_read_field32(uint8_t **data, uint16_t *size)
{
uint32_t field = 0;
| < | < | < < | < < | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
localFileHeader: (OFZIPArchive_LocalFileHeader*)localFileHeader;
@end
uint32_t
of_zip_archive_read_field32(uint8_t **data, uint16_t *size)
{
uint32_t field = 0;
if (*size < 4)
@throw [OFInvalidFormatException exception];
for (uint8_t i = 0; i < 4; i++)
field |= (uint32_t)(*data)[i] << (i * 8);
*data += 4;
*size -= 4;
return field;
}
uint64_t
of_zip_archive_read_field64(uint8_t **data, uint16_t *size)
{
uint64_t field = 0;
if (*size < 8)
@throw [OFInvalidFormatException exception];
for (uint8_t i = 0; i < 8; i++)
field |= (uint64_t)(*data)[i] << (i * 8);
*data += 8;
*size -= 8;
return field;
}
static uint32_t
calculateCRC32(uint32_t crc, uint8_t *bytes, size_t length)
{
for (size_t i = 0; i < length; i++) {
crc ^= bytes[i];
for (uint8_t j = 0; j < 8; j++)
crc = (crc >> 1) ^ (CRC32_MAGIC & (~(crc & 1) + 1));
}
return crc;
}
static void
|
| ︙ | ︙ | |||
300 301 302 303 304 305 306 |
objc_autoreleasePoolPop(pool);
}
- (void)OF_readEntries
{
void *pool = objc_autoreleasePoolPush();
| < | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 |
objc_autoreleasePoolPop(pool);
}
- (void)OF_readEntries
{
void *pool = objc_autoreleasePoolPush();
if ((of_offset_t)_centralDirectoryOffset != _centralDirectoryOffset)
@throw [OFOutOfRangeException exception];
seekOrThrowInvalidFormat(_stream,
(of_offset_t)_centralDirectoryOffset, SEEK_SET);
_entries = [[OFMutableArray alloc] init];
_pathToEntryMap = [[OFMutableDictionary alloc] init];
for (size_t i = 0; i < _centralDirectoryEntries; i++) {
OFZIPArchiveEntry *entry = [[[OFZIPArchiveEntry alloc]
OF_initWithStream: _stream] autorelease];
if ([_pathToEntryMap objectForKey: [entry fileName]] != nil)
@throw [OFInvalidFormatException exception];
[_entries addObject: entry];
|
| ︙ | ︙ |