[Author: dmaclach]

Clean up all of our format string issues amongst some other fun stuff.

R=thomasvl
DELTA=167  (90 added, 8 deleted, 69 changed)

3 files changed, 14 insertions, 10 deletions

diff --git a/AppKit/GTMCarbonEvent.m b/AppKit/GTMCarbonEvent.m
index 37e7e2f..9ff1fbf 100644
--- a/AppKit/GTMCarbonEvent.m
+++ b/AppKit/GTMCarbonEvent.m
@@ -166,7 +166,8 @@
   *((UInt32 *)cls) = CFSwapInt32HostToBig([self eventClass]);
   kind = [self eventKind];
   cls[4] = 0;
-  return [NSString stringWithFormat:@"GTMCarbonEvent '%s' %lu", cls, kind];
+  return [NSString stringWithFormat:@"GTMCarbonEvent '%s' %lu",
+          cls, (unsigned long)kind];
 }
 
 
@@ -749,7 +750,8 @@ CantCreateKey:
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"<%@ %p> - ref %p signature %lu id %lu",
-          [self class], self, hotKeyRef_, id_.signature, id_.id];
+          [self class], self, hotKeyRef_,
+          (unsigned long)id_.signature, (unsigned long)id_.id];
 }
 
 @end
diff --git a/AppKit/GTMCarbonEventTest.m b/AppKit/GTMCarbonEventTest.m
index 6a3d007..0c7286b 100644
--- a/AppKit/GTMCarbonEventTest.m
+++ b/AppKit/GTMCarbonEventTest.m
@@ -155,10 +155,10 @@ static const UInt32 kTestParameterValue = 'bam ';
        autorelease];
   [handler registerForEvents:&types count:1];
   OSStatus status = [event_ sendToTarget:handler options:0];
-  STAssertErr(status, eventNotHandledErr, @"status: %ld", status);
+  STAssertErr(status, eventNotHandledErr, @"status: %ld", (long)status);
   [handler setDelegate:self];
   status = [event_ sendToTarget:handler options:0];
-  STAssertNoErr(status, @"status: %ld", status);
+  STAssertNoErr(status, @"status: %ld", (long)status);
   [handler unregisterForEvents:&types count:1];
 }
 
@@ -167,15 +167,15 @@ static const UInt32 kTestParameterValue = 'bam ';
   [event_ postToMainQueue];
   OSStatus status = [event_ postToQueue:eventQueue
                                priority:kEventPriorityStandard];
-  STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", status);
+  STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", (long)status);
   EventTypeSpec types = { kTestClass, kTestKind };
   status = FlushEventsMatchingListFromQueue(eventQueue, 1, &types);
-  STAssertNoErr(status, @"status: %ld", status);
+  STAssertNoErr(status, @"status: %ld", (long)status);
 
   eventQueue = GetCurrentEventQueue();
   [event_ postToCurrentQueue];
   status = [event_ postToQueue:eventQueue priority:kEventPriorityStandard];
-  STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", status);
+  STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", (long)status);
   status = FlushEventsMatchingListFromQueue(eventQueue, 1, &types);
   STAssertNoErr(status, @"status: %ld", status);
 }
@@ -191,7 +191,8 @@ static const UInt32 kTestParameterValue = 'bam ';
 
 - (void)testDescription {
   NSString *descString
-    = [NSString stringWithFormat:@"GTMCarbonEvent 'foo ' %d", kTestKind];
+    = [NSString stringWithFormat:@"GTMCarbonEvent 'foo ' %lu",
+       (unsigned long)kTestKind];
   STAssertEqualObjects([event_ description], descString, nil);
 }
 @end
@@ -213,7 +214,8 @@ static const UInt32 kTestParameterValue = 'bam ';
 - (void)testEventHandler {
   [GTMUnitTestDevLogDebug expectPattern:
    @"DebugAssert: GoogleToolboxForMac: event CantUseParams .*"];
-  STAssertErr([handler_ handleEvent:nil handler:nil], eventNotHandledErr, nil);
+  STAssertErr([handler_ handleEvent:nil handler:nil],
+              (long)eventNotHandledErr, nil);
 }
 
 - (void)testDelegate {
diff --git a/AppKit/GTMNSColor+Luminance.m b/AppKit/GTMNSColor+Luminance.m
index df79068..36cfd51 100644
--- a/AppKit/GTMNSColor+Luminance.m
+++ b/AppKit/GTMNSColor+Luminance.m
@@ -124,7 +124,7 @@ static const CGFloat kGTMLuminanceDarkCutoff = 0.6;
       color = [self gtm_colorByAdjustingLuminance:-0.25];
       break;
     default:
-      _GTMDevLog(@"Invalid Coloration Use %d", use);
+      _GTMDevLog(@"Invalid Coloration Use %lu", (unsigned long)use);
       color = self;
       break;
   }