Fix some warnings when most warnings are activated

Olivier Poitrey · Olivier Poitrey · commit 0bdd448ca867 · 2009-11-11T15:43:11.000+01:00
diff --git a/SDImageCache.m b/SDImageCache.m
@@ -15,11 +15,23 @@
 
 @implementation SDImageCache
 
+#pragma mark SDImageCache (notification handlers)
+
+- (void)didReceiveMemoryWarning:(void *)object
+{
+    [self clearMemory];
+}
+
+- (void)willTerminate
+{
+    [self cleanDisk];
+}
+
 #pragma mark NSObject
 
 - (id)init
 {
-    if (self = [super init])
+    if ((self = [super init]))
     {
         // Init the memory cache
         memCache = [[NSMutableDictionary alloc] init];
@@ -69,17 +81,7 @@ - (void)dealloc
     [super dealloc];
 }
 
-- (void)didReceiveMemoryWarning:(void *)object
-{
-    [self clearMemory];
-}
-
-- (void)willTerminate
-{
-    [self cleanDisk];
-}
-
-#pragma mark ImageCache (class methods)
+#pragma mark SDImageCache (class methods)
 
 + (SDImageCache *)sharedImageCache
 {
@@ -91,7 +93,7 @@ + (SDImageCache *)sharedImageCache
     return instance;
 }
 
-#pragma mark ImageCache (private)
+#pragma mark SDImageCache (private)
 
 - (NSString *)cachePathForKey:(NSString *)key
 {
@@ -110,7 +112,7 @@ - (void)storeKeyToDisk:(NSString *)key
 
     if (image != nil)
     {
-        [[NSFileManager defaultManager] createFileAtPath:[self cachePathForKey:key] contents:UIImageJPEGRepresentation(image, 1.0) attributes:nil];
+        [[NSFileManager defaultManager] createFileAtPath:[self cachePathForKey:key] contents:UIImageJPEGRepresentation(image, (CGFloat)1.0) attributes:nil];
         [image release];
     }
 }
diff --git a/SDWebImageManager.m b/SDWebImageManager.m
@@ -16,7 +16,7 @@ @implementation SDWebImageManager
 
 - (id)init
 {
-    if (self = [super init])
+    if ((self = [super init]))
     {
         delegates = [[NSMutableArray alloc] init];
         downloaders = [[NSMutableArray alloc] init];
@@ -78,17 +78,17 @@ - (void)cancelForDelegate:(id<SDWebImageManagerDelegate>)delegate
 {
     @synchronized(self)
     {
-        NSUInteger index = [delegates indexOfObjectIdenticalTo:delegate];
+        NSUInteger idx = [delegates indexOfObjectIdenticalTo:delegate];
 
-        if (index == NSNotFound)
+        if (idx == NSNotFound)
         {
             return;
         }
 
-        SDWebImageDownloader *downloader = [[downloaders objectAtIndex:index] retain];
+        SDWebImageDownloader *downloader = [[downloaders objectAtIndex:idx] retain];
     
-        [delegates removeObjectAtIndex:index];
-        [downloaders removeObjectAtIndex:index];
+        [delegates removeObjectAtIndex:idx];
+        [downloaders removeObjectAtIndex:idx];
 
         if (![downloaders containsObject:downloader])
         {
@@ -108,20 +108,20 @@ - (void)imageDownloader:(SDWebImageDownloader *)downloader didFinishWithImage:(U
     @synchronized(self)
     {
         // Notify all the delegates with this downloader
-        for (NSInteger index = [downloaders count] - 1; index >= 0; index--)
+        for (NSInteger idx = [downloaders count] - 1; idx >= 0; idx--)
         {
-            SDWebImageDownloader *aDownloader = [downloaders objectAtIndex:index];
+            SDWebImageDownloader *aDownloader = [downloaders objectAtIndex:idx];
             if (aDownloader == downloader)
             {
-                id<SDWebImageManagerDelegate> delegate = [delegates objectAtIndex:index];
+                id<SDWebImageManagerDelegate> delegate = [delegates objectAtIndex:idx];
 
                 if (image && [delegate respondsToSelector:@selector(webImageManager:didFinishWithImage:)])
                 {
                     [delegate performSelector:@selector(webImageManager:didFinishWithImage:) withObject:self withObject:image];
                 }
 
-                [downloaders removeObjectAtIndex:index];
-                [delegates removeObjectAtIndex:index];
+                [downloaders removeObjectAtIndex:idx];
+                [delegates removeObjectAtIndex:idx];
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ @implementation SDWebImageManager`
`16`	`16`
`17`	`17`	`- (id)init`
`18`	`18`	`{`
`19`		`- if (self = [super init])`
	`19`	`+ if ((self = [super init]))`
`20`	`20`	`{`
`21`	`21`	`delegates = [[NSMutableArray alloc] init];`
`22`	`22`	`downloaders = [[NSMutableArray alloc] init];`
`@@ -78,17 +78,17 @@ - (void)cancelForDelegate:(id<SDWebImageManagerDelegate>)delegate`
`78`	`78`	`{`
`79`	`79`	`@synchronized(self)`
`80`	`80`	`{`
`81`		`- NSUInteger index = [delegates indexOfObjectIdenticalTo:delegate];`
	`81`	`+ NSUInteger idx = [delegates indexOfObjectIdenticalTo:delegate];`
`82`	`82`
`83`		`- if (index == NSNotFound)`
	`83`	`+ if (idx == NSNotFound)`
`84`	`84`	`{`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`
`88`		`- SDWebImageDownloader *downloader = [[downloaders objectAtIndex:index] retain];`
	`88`	`+ SDWebImageDownloader *downloader = [[downloaders objectAtIndex:idx] retain];`
`89`	`89`
`90`		`- [delegates removeObjectAtIndex:index];`
`91`		`- [downloaders removeObjectAtIndex:index];`
	`90`	`+ [delegates removeObjectAtIndex:idx];`
	`91`	`+ [downloaders removeObjectAtIndex:idx];`
`92`	`92`
`93`	`93`	`if (![downloaders containsObject:downloader])`
`94`	`94`	`{`
`@@ -108,20 +108,20 @@ - (void)imageDownloader:(SDWebImageDownloader *)downloader didFinishWithImage:(U`
`108`	`108`	`@synchronized(self)`
`109`	`109`	`{`
`110`	`110`	`// Notify all the delegates with this downloader`
`111`		`- for (NSInteger index = [downloaders count] - 1; index >= 0; index--)`
	`111`	`+ for (NSInteger idx = [downloaders count] - 1; idx >= 0; idx--)`
`112`	`112`	`{`
`113`		`- SDWebImageDownloader *aDownloader = [downloaders objectAtIndex:index];`
	`113`	`+ SDWebImageDownloader *aDownloader = [downloaders objectAtIndex:idx];`
`114`	`114`	`if (aDownloader == downloader)`
`115`	`115`	`{`
`116`		`- id<SDWebImageManagerDelegate> delegate = [delegates objectAtIndex:index];`
	`116`	`+ id<SDWebImageManagerDelegate> delegate = [delegates objectAtIndex:idx];`
`117`	`117`
`118`	`118`	`if (image && [delegate respondsToSelector:@selector(webImageManager:didFinishWithImage:)])`
`119`	`119`	`{`
`120`	`120`	`[delegate performSelector:@selector(webImageManager:didFinishWithImage:) withObject:self withObject:image];`
`121`	`121`	`}`
`122`	`122`
`123`		`- [downloaders removeObjectAtIndex:index];`
`124`		`- [delegates removeObjectAtIndex:index];`
	`123`	`+ [downloaders removeObjectAtIndex:idx];`
	`124`	`+ [delegates removeObjectAtIndex:idx];`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`}`