Merge pull request #257 from aidansteele/master
Format string fixes and memory leak fixes.
Showing
5 changed files
with
20 additions
and
2 deletions
| @@ -189,7 +189,7 @@ | @@ -189,7 +189,7 @@ | ||
| 189 | // Make sure nothing went wrong | 189 | // Make sure nothing went wrong |
| 190 | if ([inputStream streamStatus] == NSStreamEventErrorOccurred) { | 190 | if ([inputStream streamStatus] == NSStreamEventErrorOccurred) { |
| 191 | if (err) { | 191 | if (err) { |
| 192 | - *err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]]; | 192 | + *err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to write to the destination data file at %@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]]; |
| 193 | } | 193 | } |
| 194 | [compressor closeStream]; | 194 | [compressor closeStream]; |
| 195 | return NO; | 195 | return NO; |
| @@ -186,7 +186,7 @@ | @@ -186,7 +186,7 @@ | ||
| 186 | // Make sure nothing went wrong | 186 | // Make sure nothing went wrong |
| 187 | if ([inputStream streamStatus] == NSStreamEventErrorOccurred) { | 187 | if ([inputStream streamStatus] == NSStreamEventErrorOccurred) { |
| 188 | if (err) { | 188 | if (err) { |
| 189 | - *err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]]; | 189 | + *err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to write to the destination data file at %@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]]; |
| 190 | } | 190 | } |
| 191 | [decompressor closeStream]; | 191 | [decompressor closeStream]; |
| 192 | return NO; | 192 | return NO; |
| @@ -29,4 +29,13 @@ | @@ -29,4 +29,13 @@ | ||
| 29 | @synthesize creationDate; | 29 | @synthesize creationDate; |
| 30 | @synthesize ownerID; | 30 | @synthesize ownerID; |
| 31 | @synthesize ownerName; | 31 | @synthesize ownerName; |
| 32 | + | ||
| 33 | +- (void)dealloc | ||
| 34 | +{ | ||
| 35 | + [name release]; | ||
| 36 | + [creationDate release]; | ||
| 37 | + [ownerID release]; | ||
| 38 | + [ownerName release]; | ||
| 39 | +} | ||
| 40 | + | ||
| 32 | @end | 41 | @end |
| @@ -115,6 +115,12 @@ | @@ -115,6 +115,12 @@ | ||
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | +- (void)dealloc | ||
| 119 | +{ | ||
| 120 | + [popoverController release]; | ||
| 121 | + [rootPopoverButtonItem release]; | ||
| 122 | + [super dealloc]; | ||
| 123 | +} | ||
| 118 | 124 | ||
| 119 | @synthesize splitViewController; | 125 | @synthesize splitViewController; |
| 120 | @synthesize popoverController; | 126 | @synthesize popoverController; |
-
Please register or login to post a comment