Changeset 1287 for trunk

Timestamp:

06/22/10 18:35:28 (2 years ago)

Author:

gbooker

Message:

Corrections from the static analyzer.

Location:

trunk

Files:

• SapphireCompatibilityClasses/SapphireFrontRowCompat.m (modified) (1 diff)
• SapphireFrappliance/FRAppliance/SapphireWaitDisplay.m (modified) (1 diff)
• SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (1 diff)
• SapphireFrappliance/MetaData/Support/SapphireMetaDataScanner.m (modified) (1 diff)

trunk/SapphireCompatibilityClasses/SapphireFrontRowCompat.m

@@ -254 +254 @@
                 CGImageRef coverArt = nil;
                 CGImageSourceRef source = CGImageSourceCreateWithData((CFDataRef)imageData, nil);
-                if(source != NULL)
+                if(source != NULL) {
                         coverArt = CGImageSourceCreateImageAtIndex(source, 1, nil);
-                CFRelease(source);
+                        CFRelease(source);
+                }
                 return [(id)coverArt autorelease];
         }

trunk/SapphireFrappliance/FRAppliance/SapphireWaitDisplay.m

@@ -67 +67 @@
         NSRect newFrame;
         newFrame.size.width = newFrame.size.height = frame.size.height / 6.0f;
-        newFrame.origin.y += (frame.size.height - newFrame.size.height) / 2.0f;
+        newFrame.origin.y = (frame.size.height - newFrame.size.height) / 2.0f;
         newFrame.origin.x = (frame.size.width - newFrame.size.width) / 2.0f;
         [spinner setFrame:newFrame] ;

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -394 +394 @@
                 return YES;
 
-        int modTime = [[xmlProps objectForKey:NSFileModificationDate] timeIntervalSince1970];
+        int modTime = 0;
+        if(xmlProps)
+                modTime = [[xmlProps objectForKey:NSFileModificationDate] timeIntervalSince1970];
         if(modTime != [self importedTimeFromSource:IMPORT_TYPE_XML_MASK])
                 //XML modification time does not match our last import

trunk/SapphireFrappliance/MetaData/Support/SapphireMetaDataScanner.m

@@ -111 +111 @@
         for(i=0; i<=endIndex; i++)
         {
-                NSArray *components;
-                NSString *subDirName;
+                NSArray *components = nil;
+                NSString *subDirName = nil;
                 if(i == endIndex)
                 {