Fix analyze errors

diff --git a/pithos-apple-common b/pithos-apple-common
index cc176fe..7c60da0 160000 (submodule)
--- a/pithos-apple-common
+++ b/pithos-apple-common
@@ -1 +1 @@
-Subproject commit cc176feb28e66fac71ccdcfffa96b86b2855de68
+Subproject commit 7c60da084e353ce655541021472880a47985530d

diff --git a/pithos-macos/PithosAccountNode.m b/pithos-macos/PithosAccountNode.m
index 4c3a9ce..10fa3a4 100644 (file)
--- a/pithos-macos/PithosAccountNode.m
+++ b/pithos-macos/PithosAccountNode.m
@@ -353,6 +353,7 @@ static NSImage *sharedIcon = nil;
                 }
             }
             [[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
+            [newRequest release];
         } else {
             if ([request isEqualTo:applyMetadataAccountRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:applyMetadataAccountRequest];

diff --git a/pithos-macos/PithosBrowserController.m b/pithos-macos/PithosBrowserController.m
index d9e8aa2..a208e2e 100644 (file)
--- a/pithos-macos/PithosBrowserController.m
+++ b/pithos-macos/PithosBrowserController.m
@@ -104,7 +104,7 @@
 @interface PithosBrowserController (Private)
 - (BOOL)uploadFiles:(NSArray *)filenames toNode:(PithosNode *)destinationNode;
 - (BOOL)moveNodes:(NSArray *)nodes toNode:(PithosNode *)destinationNode;
-- (BOOL)copyNodes:(NSArray *)nodes toNode:(PithosNode *)destinationNode;
+- (BOOL)cpyNodes:(NSArray *)nodes toNode:(PithosNode *)destinationNode;
 @end
 
 @implementation PithosBrowserController
@@ -918,7 +918,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column {
             if ([info draggingSourceOperationMask] & NSDragOperationMove)
                 return [self moveNodes:draggedNodes toNode:node];
             else if ([info draggingSourceOperationMask] & NSDragOperationCopy)
-                return [self copyNodes:draggedNodes toNode:node];
+                return [self cpyNodes:draggedNodes toNode:node];
         }
     }
     return NO;
@@ -1401,7 +1401,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column {
     return YES;
 }
 
-- (BOOL)copyNodes:(NSArray *)nodes toNode:(PithosNode *)destinationNode {    
+- (BOOL)cpyNodes:(NSArray *)nodes toNode:(PithosNode *)destinationNode {    
     if ((([destinationNode class] != [PithosSubdirNode class]) && ([destinationNode class] != [PithosContainerNode class])) ||
         (([destinationNode class] == [PithosSubdirNode class]) && !destinationNode.pithosObject.subdir && [destinationNode.pithosObject.name hasSuffix:@"/"])) 
         return NO;
@@ -1432,7 +1432,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column {
                     }
                     if (operation.isCancelled)
                         return;
-                    ASIPithosObjectRequest *objectRequest = [PithosUtilities copyObjectRequestWithPithos:pithos
+                    ASIPithosObjectRequest *objectRequest = [PithosUtilities cpyObjectRequestWithPithos:pithos
                                                                                            containerName:node.pithosContainer.name 
                                                                                               objectName:node.pithosObject.name 
                                                                                 destinationContainerName:containerName 
@@ -1488,7 +1488,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column {
                     }
                     if (operation.isCancelled)
                         return;
-                    NSArray *objectRequests = [PithosUtilities copyObjectRequestsForSubdirWithPithos:pithos
+                    NSArray *objectRequests = [PithosUtilities cpyObjectRequestsForSubdirWithPithos:pithos
                                                                                        containerName:node.pithosContainer.name 
                                                                                           objectName:node.pithosObject.name 
                                                                             destinationContainerName:containerName 
@@ -2079,7 +2079,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column {
                 ([info draggingSourceOperationMask] & NSDragOperationMove))
                 return [self moveNodes:draggedNodes toNode:node];
             else if ([info draggingSourceOperationMask] & NSDragOperationCopy)
-                return [self copyNodes:draggedNodes toNode:node];
+                return [self cpyNodes:draggedNodes toNode:node];
         }
     }
     return NO;
@@ -2723,7 +2723,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column {
     PithosNode *dropNode = (PithosNode *)[sender representedObject];
     NSArray *localClipboardNodes = [NSArray arrayWithArray:clipboardNodes];
     if (clipboardCopy) {
-        [self copyNodes:localClipboardNodes toNode:dropNode];
+        [self cpyNodes:localClipboardNodes toNode:dropNode];
     } else if (![dropNode isEqualTo:clipboardParentNode]) {
         self.clipboardNodes = nil;
         self.clipboardParentNode = nil;

diff --git a/pithos-macos/PithosContainerNode.m b/pithos-macos/PithosContainerNode.m
index d3a0890..857d6d7 100644 (file)
--- a/pithos-macos/PithosContainerNode.m
+++ b/pithos-macos/PithosContainerNode.m
@@ -454,6 +454,7 @@ static NSImage *sharedIcon = nil;
                 }
             }
             [[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
+            [newRequest release];
         } else {
             if ([request isEqualTo:applyMetadataContainerRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:applyMetadataContainerRequest];

diff --git a/pithos-macos/PithosObjectNode.m b/pithos-macos/PithosObjectNode.m
index 4cbf638..6e88392 100644 (file)
--- a/pithos-macos/PithosObjectNode.m
+++ b/pithos-macos/PithosObjectNode.m
@@ -216,6 +216,7 @@
                 }
             }
             [[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
+            [newRequest release];
         } else {
             if ([request isEqualTo:applyMetadataObjectRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:applyMetadataObjectRequest];

diff --git a/pithos-macos/PithosSubdirNode.m b/pithos-macos/PithosSubdirNode.m
index 371324c..bcaf68b 100644 (file)
--- a/pithos-macos/PithosSubdirNode.m
+++ b/pithos-macos/PithosSubdirNode.m
@@ -230,6 +230,7 @@ static NSImage *sharedIcon = nil;
                 }
             }
             [[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
+            [newRequest release];
         } else {
             if ([request isEqualTo:applyMetadataObjectRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:applyMetadataObjectRequest];

diff --git a/pithos-macos/PithosUtilities.h b/pithos-macos/PithosUtilities.h
index 9a8b385..4cfc65c 100644 (file)
--- a/pithos-macos/PithosUtilities.h
+++ b/pithos-macos/PithosUtilities.h
@@ -110,14 +110,14 @@
                                        containerName:(NSString *)containerName 
                                           objectName:(NSString *)objectName;
 
-+ (ASIPithosObjectRequest *)copyObjectRequestWithPithos:(ASIPithos *)pithos 
++ (ASIPithosObjectRequest *)cpyObjectRequestWithPithos:(ASIPithos *)pithos 
                                           containerName:(NSString *)containerName 
                                              objectName:(NSString *)objectName 
                                destinationContainerName:(NSString *)destinationContainerName 
                                   destinationObjectName:(NSString *)destinationObjectName 
                                           checkIfExists:(BOOL)ifExists 
                                          sharingAccount:(NSString *)sharingAccount;
-+ (NSArray *)copyObjectRequestsForSubdirWithPithos:(ASIPithos *)pithos 
++ (NSArray *)cpyObjectRequestsForSubdirWithPithos:(ASIPithos *)pithos 
                                      containerName:(NSString *)containerName 
                                         objectName:(NSString *)objectName 
                           destinationContainerName:(NSString *)destinationContainerName 

diff --git a/pithos-macos/PithosUtilities.m b/pithos-macos/PithosUtilities.m
index c3641fe..3cbb599 100644 (file)
--- a/pithos-macos/PithosUtilities.m
+++ b/pithos-macos/PithosUtilities.m
@@ -336,6 +336,7 @@
     strcpy(tempFileNameCString, tempFileTemplateCString);
     int fileDescriptor = mkstemp(tempFileNameCString);
     NSString *tempFilePath = [fileManager stringWithFileSystemRepresentation:tempFileNameCString length:strlen(tempFileNameCString)];
+    free(tempFileNameCString);
     if (fileDescriptor == -1) {
         dispatch_async(dispatch_get_main_queue(), ^{
             NSAlert *alert = [[[NSAlert alloc] init] autorelease];
@@ -346,7 +347,6 @@
         });
         return nil;
     }
-    free(tempFileNameCString);
     NSFileHandle *tempFileHandle = [[NSFileHandle alloc] initWithFileDescriptor:fileDescriptor closeOnDealloc:YES];
 
     [missingBlocks enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop){
@@ -566,7 +566,7 @@
 #pragma mark -
 #pragma mark Copy
 
-+ (ASIPithosObjectRequest *)copyObjectRequestWithPithos:(ASIPithos *)pithos 
++ (ASIPithosObjectRequest *)cpyObjectRequestWithPithos:(ASIPithos *)pithos 
                                           containerName:(NSString *)containerName 
                                              objectName:(NSString *)objectName 
                                destinationContainerName:(NSString *)destinationContainerName 
@@ -577,7 +577,7 @@
                                           sharingAccount:nil])
         return nil;
     
-    ASIPithosObjectRequest *objectRequest = [ASIPithosObjectRequest copyObjectDataRequestWithPithos:pithos 
+    ASIPithosObjectRequest *objectRequest = [ASIPithosObjectRequest cpyObjectDataRequestWithPithos:pithos 
                                                                                       containerName:containerName 
                                                                                          objectName:objectName 
                                                                                         contentType:nil 
@@ -602,7 +602,7 @@
     return objectRequest;
 }
 
-+ (NSArray *)copyObjectRequestsForSubdirWithPithos:(ASIPithos *)pithos 
++ (NSArray *)cpyObjectRequestsForSubdirWithPithos:(ASIPithos *)pithos 
                                      containerName:(NSString *)containerName 
                                         objectName:(NSString *)objectName 
                           destinationContainerName:(NSString *)destinationContainerName 
@@ -622,7 +622,7 @@
     ASIPithosObjectRequest *objectRequest;
     if ([objectName isEqualToString:destinationObjectName]) {
         if (![objectName hasSuffix:@"/"]) {
-            objectRequest = [ASIPithosObjectRequest copyObjectDataRequestWithPithos:pithos 
+            objectRequest = [ASIPithosObjectRequest cpyObjectDataRequestWithPithos:pithos 
                                                                       containerName:containerName 
                                                                          objectName:objectName 
                                                                         contentType:nil 
@@ -647,7 +647,7 @@
             [objectRequests addObject:objectRequest];
         }
         for (ASIPithosObject *object in objects) {
-            objectRequest = [ASIPithosObjectRequest copyObjectDataRequestWithPithos:pithos 
+            objectRequest = [ASIPithosObjectRequest cpyObjectDataRequestWithPithos:pithos 
                                                                       containerName:containerName 
                                                                          objectName:object.name 
                                                                         contentType:nil 
@@ -673,7 +673,7 @@
         }
     } else {
         if (![objectName hasSuffix:@"/"]) {
-            objectRequest = [ASIPithosObjectRequest copyObjectDataRequestWithPithos:pithos 
+            objectRequest = [ASIPithosObjectRequest cpyObjectDataRequestWithPithos:pithos 
                                                                       containerName:containerName 
                                                                          objectName:objectName 
                                                                         contentType:nil 
@@ -704,7 +704,7 @@
                                                                    withString:destinationObjectName
                                                                       options:NSAnchoredSearch
                                                                         range:prefixRange];
-            objectRequest = [ASIPithosObjectRequest copyObjectDataRequestWithPithos:pithos 
+            objectRequest = [ASIPithosObjectRequest cpyObjectDataRequestWithPithos:pithos 
                                                                       containerName:containerName 
                                                                          objectName:object.name 
                                                                         contentType:nil 
@@ -996,13 +996,15 @@
     ASINetworkQueue *networkQueue = [ASINetworkQueue queue];
     [networkQueue go];
     [networkQueue addOperations:[NSArray arrayWithObject:[self prepareRequest:objectRequest]] waitUntilFinished:YES];
-    *error = [objectRequest error];
-    if (*error) {
-        [self httpRequestErrorAlertWithRequest:objectRequest];
-        return NO;
-    } else if (objectRequest.responseStatusCode == 200) {
-        *isDirectory = [self isContentTypeDirectory:[objectRequest contentType]];
-        return YES;
+    if (error != NULL) {
+        *error = [objectRequest error];
+        if (*error) {
+            [self httpRequestErrorAlertWithRequest:objectRequest];
+            return NO;
+        } else if (objectRequest.responseStatusCode == 200) {
+            *isDirectory = [self isContentTypeDirectory:[objectRequest contentType]];
+            return YES;
+        }
     }
     return NO;
 }