From 29302f49b344c1a5b37b9b0925e5f452c7ce54cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=A9=E8=BE=BA=E7=BE=85=E3=82=A8=E3=83=AB=E3=83=8D?= =?UTF-8?q?=E3=82=B9=E3=83=88?= Date: Wed, 21 May 2014 17:15:01 +0900 Subject: [PATCH] Improve logging and fix arm64 warnings when printing integers with %d --- SDWebImage/SDWebImagePrefetcher.m | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/SDWebImage/SDWebImagePrefetcher.m b/SDWebImage/SDWebImagePrefetcher.m index 1b7a88e..74a3bc1 100644 --- a/SDWebImage/SDWebImagePrefetcher.m +++ b/SDWebImage/SDWebImagePrefetcher.m @@ -8,6 +8,10 @@ #import "SDWebImagePrefetcher.h" +#if !defined(DEBUG) && !defined (SD_VERBOSE) +#define NSLog(...) +#endif + @interface SDWebImagePrefetcher () @property (strong, nonatomic) SDWebImageManager *manager; @@ -60,17 +64,13 @@ if (self.progressBlock) { self.progressBlock(self.finishedCount,[self.prefetchURLs count]); } -#ifdef SD_VERBOSE - NSLog(@"Prefetched %d out of %d", self.finishedCount, self.prefetchURLs.count); -#endif + NSLog(@"Prefetched %@ out of %@", @(self.finishedCount), @(self.prefetchURLs.count)); } else { if (self.progressBlock) { self.progressBlock(self.finishedCount,[self.prefetchURLs count]); } -#ifdef SD_VERBOSE - NSLog(@"Prefetched %d out of %d (Failed)", self.finishedCount, [self.prefetchURLs count]); -#endif + NSLog(@"Prefetched %@ out of %@ (Failed)", @(self.finishedCount), @(self.prefetchURLs.count)); // Add last failed self.skippedCount++; @@ -100,9 +100,7 @@ - (void)reportStatus { NSUInteger total = [self.prefetchURLs count]; -#ifdef SD_VERBOSE - NSLog(@"Finished prefetching (%d successful, %d skipped, timeElasped %.2f)", total - self.skippedCount, self.skippedCount, CFAbsoluteTimeGetCurrent() - self.startedTime); -#endif + NSLog(@"Finished prefetching (%@ successful, %@ skipped, timeElasped %.2f)", @(total - self.skippedCount), @(self.skippedCount), CFAbsoluteTimeGetCurrent() - self.startedTime); if ([self.delegate respondsToSelector:@selector(imagePrefetcher:didFinishWithTotalCount:skippedCount:)]) { [self.delegate imagePrefetcher:self didFinishWithTotalCount:(total - self.skippedCount)