ObjFW  Diff

Differences From Artifact [134d5e947d]:

To Artifact [56c946d958]:


78
79
80
81
82
83
84
85
86


87
88
89
90
91
92
93
78
79
80
81
82
83
84


85
86
87
88
89
90
91
92
93







-
-
+
+







	OFStream *_stream, *_decompressedStream;
	OFZIPArchiveEntry *_entry;
	uint64_t _toRead;
	uint32_t _CRC32;
	bool _atEndOfStream;
}

- (instancetype)initWithStream: (OFStream *)stream
			 entry: (OFZIPArchiveEntry *)entry;
- (instancetype)of_initWithStream: (OFStream *)stream
			    entry: (OFZIPArchiveEntry *)entry;
@end

@interface OFZIPArchive_FileWriteStream: OFStream
{
	OFStream *_stream;
	uint32_t _CRC32;
@public
459
460
461
462
463
464
465
466
467


468
469
470
471
472
473
474
459
460
461
462
463
464
465


466
467
468
469
470
471
472
473
474







-
-
+
+







		    (localFileHeader->_minVersionNeeded & 0xFF) % 10];

		@throw [OFUnsupportedVersionException
		    exceptionWithVersion: version];
	}

	_lastReturnedStream = [[OFZIPArchive_FileReadStream alloc]
	     initWithStream: _stream
		      entry: entry];
	     of_initWithStream: _stream
			 entry: entry];

	objc_autoreleasePoolPop(pool);

	return [[_lastReturnedStream retain] autorelease];
}

- (OFStream *)streamForWritingEntry: (OFZIPArchiveEntry *)entry_
724
725
726
727
728
729
730
731
732


733
734
735
736
737
738
739
724
725
726
727
728
729
730


731
732
733
734
735
736
737
738
739







-
-
+
+







		return false;

	return true;
}
@end

@implementation OFZIPArchive_FileReadStream
- (instancetype)initWithStream: (OFStream *)stream
			 entry: (OFZIPArchiveEntry *)entry
- (instancetype)of_initWithStream: (OFStream *)stream
			    entry: (OFZIPArchiveEntry *)entry
{
	self = [super init];

	@try {
		_stream = [stream retain];

		switch ([entry compressionMethod]) {