Remove those releases, since they don't work and break things. D'oh!

bellroy · Jun 10, 2010 · 0536e7d · 0536e7d
1 parent 7e237df
commit 0536e7d
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 28 deletions.
diff --git a/NSFileManager+ZKAdditions.m b/NSFileManager+ZKAdditions.m
@@ -170,11 +170,9 @@ - (NSUInteger) zk_crcForPath:(NSString *)path invoker:(id)invoker throttleThread
 			if (irtsIsCancelled) {
 				if ([invoker isCancelled]) {
 					[fileHandle closeFile];
-					[block release];
 					return 0;
 				}
 			}
-			[block release];
 			block = [fileHandle readDataOfLength:crcBlockSize];
 			[NSThread sleepForTimeInterval:throttleThreadSleepTime];
 		}

diff --git a/ZKArchive.m b/ZKArchive.m
@@ -40,7 +40,6 @@ + (BOOL) validArchiveAtPath:(NSString *) path {
 	[fileHandle closeFile];
 	UInt32 headerValue;
 	[fileHeader getBytes:&headerValue];
-	[fileHeader release];
 	return (CFSwapInt32LittleToHost(headerValue) == ZKLFHeaderMagicNumber);
 }
 

diff --git a/ZKCDHeader.m b/ZKCDHeader.m
@@ -56,13 +56,6 @@ - (void) removeObservers {
 
 - (void) dealloc {
 	[self removeObservers];
-
-	[self.cachedData release];
-	[self.lastModDate release];
-	[self.filename release];
-	[self.extraField release];
-	[self.comment release];
-
 	self.cachedData = nil;
 	self.lastModDate = nil;
 	self.filename = nil;
@@ -131,11 +124,9 @@ + (ZKCDHeader *) recordWithArchivePath:(NSString *)path atOffset:(unsigned long
 	[file seekToFileOffset:offset];
 	NSData *fixedData = [file readDataOfLength:ZKCDHeaderFixedDataLength];
 	ZKCDHeader *record = [self recordWithData:fixedData atOffset:0];
-	[fixedData release];
 	if (record.filenameLength > 0) {
 		NSData *data = [file readDataOfLength:record.filenameLength];
 		record.filename = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease];
-		[data release];
 	}
 	if (record.extraFieldLength > 0) {
 		record.extraField = [file readDataOfLength:record.extraFieldLength];
@@ -144,7 +135,6 @@ + (ZKCDHeader *) recordWithArchivePath:(NSString *)path atOffset:(unsigned long
 	if (record.commentLength > 0) {
 		NSData *data = [file readDataOfLength:record.commentLength];
 		record.comment = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease];
-		[data release];
 	} else
 		record.comment = nil;
 

diff --git a/ZKCDTrailer.m b/ZKCDTrailer.m
@@ -40,7 +40,6 @@ - (void) finalize {
 
 - (void) dealloc {
 	[self removeObservers];
-	[self.comment release];
 	self.comment = nil;
 	[super dealloc];
 }
@@ -92,7 +91,6 @@ + (ZKCDTrailer *) recordWithArchivePath:(NSString *)path {
 		[file seekToFileOffset:fileOffset];
 		NSData *data = [file readDataOfLength:sizeof(UInt32)];
 		[data getBytes:&trailerCheck length:sizeof(UInt32)];
-		[data release];
 	}
 	if (fileOffset < 1) {
 		[file closeFile];
@@ -103,7 +101,6 @@ + (ZKCDTrailer *) recordWithArchivePath:(NSString *)path {
 	NSData *data = [file readDataToEndOfFile];
 	[file closeFile];
 	ZKCDTrailer *record = [self recordWithData:data atOffset:(NSUInteger) 0];
-	[data release];
 	return record;
 }
 

diff --git a/ZKCDTrailer64.m b/ZKCDTrailer64.m
@@ -47,7 +47,6 @@ + (ZKCDTrailer64 *) recordWithArchivePath:(NSString *)path atOffset:(unsigned lo
 	NSData *data = [file readDataOfLength:ZKCDTrailer64FixedDataLength];
 	[file closeFile];
 	ZKCDTrailer64 *record = [self recordWithData:data atOffset:0];
-	[data release];
 	return record;
 }
 

diff --git a/ZKCDTrailer64Locator.m b/ZKCDTrailer64Locator.m
@@ -38,7 +38,6 @@ + (ZKCDTrailer64Locator *) recordWithArchivePath:(NSString *)path andCDTrailerLe
 	NSData *data = [file readDataOfLength:ZKCDTrailer64LocatorFixedDataLength];
 	[file closeFile];
 	ZKCDTrailer64Locator *record = [self recordWithData:data atOffset:0];
-	[data release];
 	return record;
 }
 

diff --git a/ZKFileArchive.m b/ZKFileArchive.m
@@ -262,7 +262,6 @@ - (NSInteger) inflateFile:(ZKCDHeader *)cdHeader toDirectory:(NSString *)expansi
 		// symbolic links are stored as uncompressed UTF-8-encoded string data in the archive
 		NSData *symLinkData = [archiveFile readDataOfLength:cdHeader.compressedSize];
 		NSString *symLinkDestinationPath = [[[NSString alloc] initWithData:symLinkData encoding:NSUTF8StringEncoding] autorelease];
-		[symLinkData release];
 		NSString *filename = [expansionDirectory stringByAppendingPathComponent:cdHeader.filename];
 		result = [self.fileManager createDirectoryAtPath:[path stringByDeletingLastPathComponent]
 							 withIntermediateDirectories:YES attributes:nil error:nil];
@@ -313,7 +312,6 @@ - (NSInteger) inflateFile:(ZKCDHeader *)cdHeader toDirectory:(NSString *)expansi
 									if (self.delegate)
 										[self performSelectorOnMainThread:@selector(didCancel) withObject:nil waitUntilDone:NO];
 									[archiveFile closeFile];
-									[deflatedData release];
 									return zkCancelled;
 								}
 							}
@@ -330,7 +328,6 @@ - (NSInteger) inflateFile:(ZKCDHeader *)cdHeader toDirectory:(NSString *)expansi
 							bytesWritten = 0;
 						}
 					}
-					[deflatedData release];
 					[NSThread sleepForTimeInterval:self.throttleThreadSleepTime];
 				} while (ret != Z_STREAM_END && ret != Z_STREAM_ERROR);
 				if ([self delegateWantsSizes]) {
@@ -371,7 +368,6 @@ - (NSInteger) inflateFile:(ZKCDHeader *)cdHeader toDirectory:(NSString *)expansi
 							bytesWritten = 0;
 						}
 					}
-					[deflatedData release];
 					[NSThread sleepForTimeInterval:self.throttleThreadSleepTime];
 					if (irtsIsCancelled) {
 						if ([self.invoker isCancelled]) {
@@ -533,7 +529,6 @@ - (NSInteger) deflateFile:(NSString *)path relativeToPath:(NSString *)basePath u
 							if ([self.invoker isCancelled]) {
 								[file closeFile];
 								[archiveFile closeFile];
-								[fileData release];
 								if (self.delegate)
 									[self performSelectorOnMainThread:@selector(didCancel) withObject:nil waitUntilDone:NO];
 								return zkCancelled;
@@ -543,15 +538,13 @@ - (NSInteger) deflateFile:(NSString *)path relativeToPath:(NSString *)basePath u
 						ZKLogError(@"Error in deflate");
 						[file closeFile];
 						[archiveFile closeFile];
-						[fileData release];
 						return zkFailed;
 					}
 				} while (strm.avail_out == 0);
 				if (strm.avail_in != 0) {
 					ZKLogError(@"All input not used");
 					[file closeFile];
 					[archiveFile closeFile];
-					[fileData release];
 					return zkFailed;
 				}
 				if ([self delegateWantsSizes]) {
@@ -564,7 +557,6 @@ - (NSInteger) deflateFile:(NSString *)path relativeToPath:(NSString *)basePath u
 						bytesWritten = 0;
 					}
 				}
-				[fileData release];
 				[NSThread sleepForTimeInterval:self.throttleThreadSleepTime];
 			} while (flush != Z_FINISH);
 			deflateEnd(&strm);

diff --git a/ZKLFHeader.m b/ZKLFHeader.m
@@ -98,11 +98,9 @@ + (ZKLFHeader *) recordWithArchivePath:(NSString *) path atOffset:(unsigned long
 	[file seekToFileOffset:offset];
 	NSData *fixedData = [file readDataOfLength:ZKLFHeaderFixedDataLength];
 	ZKLFHeader *record = [self recordWithData:fixedData atOffset:0];
-	[fixedData release];
 	if (record.filenameLength > 0) {
 		NSData *data = [file readDataOfLength:record.filenameLength];
 		record.filename = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease];
-		[data release];
 	}
 	if (record.extraFieldLength > 0) {
 		record.extraField = [file readDataOfLength:record.extraFieldLength];