ObjFW  Diff

Differences From Artifact [e50224d01e]:

• File src/OFGZIPStream.m — part of check-in [2a2e17d8d0] at 2016-05-06 20:39:56 on branch trunk — Enable -Wsign-compare (user: js, size: 5820) [annotate] [blame] [check-ins using]

To Artifact [0950f8ddc7]:

• File src/OFGZIPStream.m — part of check-in [134a1121c7] at 2016-05-29 13:02:05 on branch trunk — Rename OFInflateStream back to OFDeflateStream

  The reason for renaming to OFInflateStream was to have one stream for
  decompression and one for compression in order to reduce memory usage if
  only one of the two is needed, as the ivar layout will be smaller then.
  However, it is more consistent with other stream classes to have one
  stream that can handle both. The increased memory footprint of having
  ivars for compression and decompression can be solved by having a
  pointer to those instead. This will not incur any performance penalty,
  as the pointer will be dereferenced instead of the ivars, meaning the
  overhead is only getting the pointer from the ivars once. (user: js, size: 5820) [annotate] [blame] [check-ins using]

13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

#include "config.h"

#import "OFGZIPStream.h"
#import "OFInflateStream.h"
#import "OFDate.h"

#import "crc32.h"

#import "OFChecksumFailedException.h"
#import "OFInvalidFormatException.h"

|

13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

#include "config.h"

#import "OFGZIPStream.h"
#import "OFDeflateStream.h"
#import "OFDate.h"

#import "crc32.h"

#import "OFChecksumFailedException.h"
#import "OFInvalidFormatException.h"

200
201
202
203
204
205
206
207
208
209
210
211
212
213
214

			 */

			_bytesRead = 0;
			_state++;
			break;
		case OF_GZIP_STREAM_DATA:
			if (_inflateStream == nil)
				_inflateStream = [[OFInflateStream alloc]
				    initWithStream: _stream];

			if (![_inflateStream isAtEndOfStream]) {
				size_t bytesRead = [_inflateStream
				    readIntoBuffer: buffer
					    length: length];

|

200
201
202
203
204
205
206
207
208
209
210
211
212
213
214

			 */

			_bytesRead = 0;
			_state++;
			break;
		case OF_GZIP_STREAM_DATA:
			if (_inflateStream == nil)
				_inflateStream = [[OFDeflateStream alloc]
				    initWithStream: _stream];

			if (![_inflateStream isAtEndOfStream]) {
				size_t bytesRead = [_inflateStream
				    readIntoBuffer: buffer
					    length: length];