ObjFW  Check-in [a1ea38be5b]

Overview
Comment:Make GCC happy again
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a1ea38be5b7c1ea32e9863e80449e980012e28d986ff7f8b7c44d934915c336d
User & Date: js on 2023-07-25 21:35:57
Other Links: manifest | tags
Context
2023-07-26
19:05
OFZIPArchive: Handle CD spanning multiple parts check-in: a847357585 user: js tags: trunk
2023-07-25
21:35
Make GCC happy again check-in: a1ea38be5b user: js tags: trunk
21:21
OFZIPArchive: Handle files spanning multiple parts check-in: d6f5e2abc5 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/OFZIPArchive.m from [e0e6f86ab3] to [2026ad717c].

︙
837
838
839
840
841
842
843
844
845


846
847
848
849
850
851
852

837
838
839
840
841
842
843


844
845
846
847
848
849
850
851
852








-
-
+
+









	if (_decompressedStream == nil)
		@throw [OFNotOpenException exceptionWithObject: self];

	if (_atEndOfStream)
		return 0;

	if (_archive->_stream.atEndOfStream &&
	    !_decompressedStream.hasDataInReadBuffer) {
	if ([_archive->_stream isAtEndOfStream] &&
	    ![_decompressedStream hasDataInReadBuffer]) {
		OFStream *oldStream, *oldDecompressedStream;
		OFSeekableStream *stream;

		if (_archive->_diskNumber >= _archive->_lastDiskNumber)
			@throw [OFTruncatedDataException exception];

		oldStream = _archive->_stream;
︙
910
911
912
913
914
915
916
917

918
919
920
921
922
923
924

910
911
912
913
914
915
916

917
918
919
920
921
922
923
924








-
+









	return ret;
}

- (bool)hasDataInReadBuffer
{
	return (super.hasDataInReadBuffer ||
	    _decompressedStream.hasDataInReadBuffer);
	    [_decompressedStream hasDataInReadBuffer]);
}

- (int)fileDescriptorForReading
{
	return ((id <OFReadyForReadingObserving>)_decompressedStream)
	    .fileDescriptorForReading;
}
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.016s