Differences From Artifact [deb3b00a60]:
- File
src/OFTarArchive.m
— part of check-in
[2f4e0df8be]
at
2017-10-17 00:33:37
on branch trunk
— Do not use implicit method return types
Instead, explicitly declare them, as OF_ASSUME_NONNULL_{BEGIN,END} does
not apply to implicit return types. This means that after this commit,
all init methods have a nonnull return type, as they should have. (user: js, size: 9442) [annotate] [blame] [check-ins using]
To Artifact [72c8a07e42]:
- File src/OFTarArchive.m — part of check-in [a06354b42a] at 2017-10-22 15:05:39 on branch trunk — Make Apple GCC with -Wshadow happy (user: js, size: 9448) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
295 296 297 298 299 300 301 | if (_stream == nil) @throw [OFNotOpenException exceptionWithObject: self]; if (_atEndOfStream) return 0; | > | > | 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | if (_stream == nil) @throw [OFNotOpenException exceptionWithObject: self]; if (_atEndOfStream) return 0; #if SIZE_MAX >= UINT64_MAX if (length > UINT64_MAX) @throw [OFOutOfRangeException exception]; #endif if ((uint64_t)length > _toRead) length = (size_t)_toRead; ret = [_stream readIntoBuffer: buffer length: length]; |
︙ | ︙ | |||
374 375 376 377 378 379 380 | _toRead = 0; } size = [_entry size]; if (size % 512 != 0) [_stream readIntoBuffer: buffer | | | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | _toRead = 0; } size = [_entry size]; if (size % 512 != 0) [_stream readIntoBuffer: buffer exactLength: (size_t)(512 - (size % 512))]; } } @end @implementation OFTarArchive_FileWriteStream - (instancetype)initWithStream: (OFStream *)stream entry: (OFTarArchiveEntry *)entry |
︙ | ︙ |