[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)

5 files changed, 15 insertions, 11 deletions

diff --git a/Foundation/GTMFourCharCode.m b/Foundation/GTMFourCharCode.m
index f5a08bf..44ab688 100644
--- a/Foundation/GTMFourCharCode.m
+++ b/Foundation/GTMFourCharCode.m
@@ -77,10 +77,10 @@
 }
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"%@ - %@ (0x%X)", 
+  return [NSString stringWithFormat:@"%@ - %@ (0x%lX)", 
           [self class],
           [self stringValue],
-          code_];
+          (unsigned long)code_];
 }
 
 - (FourCharCode)fourCharCode {
diff --git a/Foundation/GTMLoggerTest.m b/Foundation/GTMLoggerTest.m
index 3c915c8..c48bf65 100644
--- a/Foundation/GTMLoggerTest.m
+++ b/Foundation/GTMLoggerTest.m
@@ -86,6 +86,10 @@
  @private
   NSString *path_;
 }
+
+- (NSString *)stringFromFormatter:(id<GTMLogFormatter>)formatter
+                            level:(GTMLoggerLevel)level
+                           format:(NSString *)fmt, ... NS_FORMAT_FUNCTION(3,4);
 @end
 
 @implementation GTMLoggerTest
diff --git a/Foundation/GTMNSAppleScript+Handler.m b/Foundation/GTMNSAppleScript+Handler.m
index 3917015..34b21c6 100644
--- a/Foundation/GTMNSAppleScript+Handler.m
+++ b/Foundation/GTMNSAppleScript+Handler.m
@@ -250,7 +250,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:);
     desc = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&result]
             autorelease];
   } else {
-    _GTMDevLog(@"Unable to coerce script %d", (int)error);
+    _GTMDevLog(@"Unable to coerce script %ld", (long)error);
   }
   return desc;
 }
@@ -264,7 +264,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:);
                                     kASHasOpenHandler,
                                     &value);
   if (error) {
-    _GTMDevLog(@"Unable to get script info about open handler %d", (int)error);
+    _GTMDevLog(@"Unable to get script info about open handler %ld", (long)error);
     value = 0;
   }
   return value != 0;
@@ -462,7 +462,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:);
     }
   }
   if (err != noErr) {
-    _GTMDevLog(@"Unable to create desc for id:%d (%d)", osaID, (int)err); // COV_NF_LINE
+    _GTMDevLog(@"Unable to create desc for id:%lu (%ld)", (unsigned long)osaID, (long)err); // COV_NF_LINE
   }
   return desc;
 }
diff --git a/Foundation/GTMNSString+XMLTest.m b/Foundation/GTMNSString+XMLTest.m
index 4788690..7e37e31 100644
--- a/Foundation/GTMNSString+XMLTest.m
+++ b/Foundation/GTMNSString+XMLTest.m
@@ -37,7 +37,7 @@
                                               length:sizeof(chars) / sizeof(UniChar)];
   NSString *string2 =
    [NSString stringWithFormat:@"zzzzz&quot;z&amp;z&apos;z&lt;z&gt;z zzz%Czzz\nz\rz\tz",
-    0xE000];
+    (unsigned short)0xE000];
 
   STAssertEqualObjects([string1 gtm_stringBySanitizingAndEscapingForXML],
                        string2,
@@ -69,7 +69,7 @@
                                               length:sizeof(chars) / sizeof(UniChar)];
   NSString *string2 =
     [NSString stringWithFormat:@"zzzzz\"z&z'z<z>z zzz%Czzz\nz\rz\tz",
-     0xE000];
+     (unsigned short)0xE000];
   
   STAssertEqualObjects([string1 gtm_stringBySanitizingToXMLSpec],
                        string2,
diff --git a/Foundation/GTMStackTrace.m b/Foundation/GTMStackTrace.m
index 8b482e6..db844b1 100644
--- a/Foundation/GTMStackTrace.m
+++ b/Foundation/GTMStackTrace.m
@@ -172,8 +172,8 @@ static NSString *GTMStackTraceFromAddressDescriptors(struct GTMAddressDescriptor
       fileName = @"??";
     }
     if (descs[i].class_name) {
-      [trace appendFormat:@"#%-2u %-35s %0*lX %s[%s %s]",
-       i,
+      [trace appendFormat:@"#%-2lu %-35s %0*lX %s[%s %s]",
+       (unsigned long)i,
        [fileName UTF8String],
        // sizeof(void*) * 2 is the length of the hex address (32 vs 64) and + 2 
        // for the 0x prefix
@@ -183,8 +183,8 @@ static NSString *GTMStackTraceFromAddressDescriptors(struct GTMAddressDescriptor
        descs[i].class_name,
        (descs[i].symbol ? descs[i].symbol : "??")];
     } else {
-      [trace appendFormat:@"#%-2u %-35s %0*lX %s()",
-       i, 
+      [trace appendFormat:@"#%-2lu %-35s %0*lX %s()",
+       (unsigned long)i,
        [fileName UTF8String],
        // sizeof(void*) * 2 is the length of the hex address (32 vs 64) and + 2 
        // for the 0x prefix