Changeset 1143 for branches

Timestamp:

02/18/10 16:32:05 (2 years ago)

Author:

gbooker

Message:

Warning removals and corrections from analyzer

Location:

branches/PlayerFramework/CommonMediaPlayer

Files:

• Classes/AGProcess.m (modified) (3 diffs)
• Media Players/DVD Framework/CMPDVDImporter.m (modified) (5 diffs)
• Media Players/DVD Framework/CMPDVDPlayer.m (modified) (1 diff)

branches/PlayerFramework/CommonMediaPlayer/Classes/AGProcess.m

@@ -467 +467 @@
 - (void)doProcargs
 {       
-        id args = [NSMutableArray array];
-        id env = [NSMutableDictionary dictionary];
+        NSMutableArray *args = [NSMutableArray array];
+        NSMutableDictionary *env = [NSMutableDictionary dictionary];
         int mib[3];
 
@@ -605 +605 @@
                                         [env setObject:[string substringFromIndex:index + 1] forKey:[string substringToIndex:index]];
                         }
-                        args = [args subarrayWithRange:NSMakeRange(0, i + 1)];
+                        [args removeObjectsInRange:NSMakeRange(i+1, [args count]-(i+1))];
                 } else {
                         // we're using the older sysctl selector, so we just guess by looking for an '=' in the argument
@@ -616 +616 @@
                                 [env setObject:[string substringFromIndex:index + 1] forKey:[string substringToIndex:index]];
                         }
-                        args = [args subarrayWithRange:NSMakeRange(0, i + 1)];
+                        [args removeObjectsInRange:NSMakeRange(i+1, [args count]-(i+1))];
                 }
         } else {

branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDImporter.m

@@ -22 +22 @@
 #import "CMPDVDImporter.h"
 
+@interface NSObject (GrowlApplicationBridgeRoutines)
++ (void)setGrowlDelegate:(id)delegate;
++ (void) notifyWithTitle:(NSString *)title description:(NSString *)description notificationName:(NSString *)notifName iconData:(NSData *)iconData priority:(signed int)priority isSticky:(BOOL)isSticky clickContext:(id)clickContext;
+@end
+
+
 @implementation CMPDVDImporter
 
@@ -140 +146 @@
 }
 
-- (BOOL)initiatePlaybackWithResume:(BOOL *)resume
+- (void)initiatePlaybackWithResume:(BOOL *)resume
 {
         
@@ -154 +160 @@
                 [currentTask terminate];
                 //if a dvd is already importing, we kill it
-                return NO;
         }
         [NSThread detachNewThreadSelector: @selector(importDVD:)
                                                          toTarget: self
                                                    withObject: dvdArray];
-        
-        return YES;
 }
 
@@ -200 +203 @@
                         [pip release];
                         pip = nil;
-                        return rdisk;
-                        
-                } else if([arr1 count] > 1)
+                        break;
+                }
+                else if([arr1 count] > 1)
                 {
                         rdisk = [arr1 objectAtIndex:0];
@@ -211 +214 @@
                         [pip release];
                         pip = nil;
-                        return rdisk;
-                        
+                        break;
                 }
         }
+        [lineArray release];
     [mnt release];
         mnt = nil;

branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayer.m

@@ -167 +167 @@
         [hdiTask launch];
         [hdiTask waitUntilExit];
-        id vDict;
-        NSString *error;
+        id vDict = nil;
+        NSString *error = nil;
         NSPropertyListFormat format;
         NSData *outData;