Prefer ARC-scoped release rather than autorelease in the API

* Creating old entry stream and data is now by convention “ns_returns_retained”, which stops autoreleasing on returning large data (see @f5abe34).
pixelglow · Nov 12, 2013 · 7fe656b · 7fe656b
1 parent 84f7a07
commit 7fe656b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/zipzap/ZZArchiveEntry.h b/zipzap/ZZArchiveEntry.h
@@ -162,14 +162,14 @@
  *
  * @return The new stream: *nil* for new entries.
  */
-- (NSInputStream*)stream;
+- (NSInputStream*)newStream;
 
 /**
  * Creates data to represent the entry file.
  *
  * @return The new data: *nil* for new entries.
  */
-- (NSData*)data;
+- (NSData*)newData;
 
 /**
  * Creates a data provider to represent the entry file.

diff --git a/zipzap/ZZArchiveEntry.m b/zipzap/ZZArchiveEntry.m
@@ -115,7 +115,7 @@ - (NSString*)fileName
 	return nil;
 }
 
-- (NSInputStream*)stream
+- (NSInputStream*)newStream
 {
 	return nil;
 }
@@ -125,7 +125,7 @@ - (BOOL)check:(NSError **)error
 	return YES;
 }
 
-- (NSData*)data
+- (NSData*)newData
 {
 	return nil;
 }

diff --git a/zipzap/ZZOldArchiveEntry.h b/zipzap/ZZOldArchiveEntry.h
@@ -33,8 +33,8 @@
 
 - (BOOL)check:(NSError **)error;
 
-- (NSInputStream*)stream;
-- (NSData*)data;
+- (NSInputStream*)newStream;
+- (NSData*)newData;
 - (CGDataProviderRef)newDataProvider;
 
 @end
diff --git a/zipzap/ZZOldArchiveEntry.mm b/zipzap/ZZOldArchiveEntry.mm
@@ -186,7 +186,7 @@ - (BOOL)check:(NSError**)error
 	return YES;
 }
 
-- (NSInputStream*)stream
+- (NSInputStream*)newStream
 {
 	switch (_centralFileHeader->compressionMethod)
 	{
@@ -201,7 +201,7 @@ - (NSInputStream*)stream
 	}
 }
 
-- (NSData*)data
+- (NSData*)newData
 {
 	switch (_centralFileHeader->compressionMethod)
 	{

diff --git a/zipzapTests/ZZUnzipTests.m b/zipzapTests/ZZUnzipTests.m
@@ -62,7 +62,7 @@ - (void)checkExtractingZipEntryStreamWithChunkSize:(NSUInteger)chunkSize
 		ZZArchiveEntry* nextEntry = _zipFile.entries[index];
 		NSString* nextEntryFilePath = _entryFilePaths[index];
 
-		NSInputStream* stream = [nextEntry stream];
+		NSInputStream* stream = [nextEntry newStream];
 
 		[stream open];
 
@@ -210,7 +210,7 @@ - (void)testZipFromDataConsistentWithZipFromURL
 
 		XCTAssertEqual(zipEntry.crc32, zipFromDataEntry.crc32, @"zipFromDataEntry.entries[%lu].crc32 must match the reference entry.", (unsigned long)index);
 
-		XCTAssertEqualObjects(zipEntry.data, zipFromDataEntry.data, @"zipFromDataEntry.entries[%lu].data must match the reference entry.", (unsigned long)index);
+		XCTAssertEqualObjects([zipEntry newData], [zipFromDataEntry newData], @"zipFromDataEntry.entries[%lu].data must match the reference entry.", (unsigned long)index);
 
 		XCTAssertEqual(zipEntry.fileMode, zipFromDataEntry.fileMode, @"zipFromDataEntry.entries[%lu].fileMode must match the reference entry.", (unsigned long)index);
 
@@ -229,7 +229,7 @@ - (void)testExtractingZipEntryData
 		ZZArchiveEntry* nextEntry = _zipFile.entries[index];
 		NSString* nextEntryFilePath = _entryFilePaths[index];
 
-		XCTAssertEqualObjects(nextEntry.data,
+		XCTAssertEqualObjects([nextEntry newData],
 							 [self dataAtFilePath:nextEntryFilePath],
 							 @"zipFile.entries[%lu].data must match the original file data.",
 							 (unsigned long)index);