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

2 files changed, 17 insertions, 2 deletions

diff --git a/AddressBook/GTMABAddressBook.m b/AddressBook/GTMABAddressBook.m
index 6aa55e4..77d194d 100644
--- a/AddressBook/GTMABAddressBook.m
+++ b/AddressBook/GTMABAddressBook.m
@@ -595,11 +595,19 @@ typedef struct {
 }
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"%@ %@ %@ %d", 
+#if GTM_IPHONE_SDK
+  return [NSString stringWithFormat:@"%@ %@ %@ %d",
+          [self class], 
+          [self valueForProperty:kGTMABPersonFirstNameProperty],
+          [self valueForProperty:kGTMABPersonLastNameProperty],
+          [self recordID]]; 
+#else  // GTM_IPHONE_SDK
+  return [NSString stringWithFormat:@"%@ %@ %@ %@",
           [self class], 
           [self valueForProperty:kGTMABPersonFirstNameProperty],
           [self valueForProperty:kGTMABPersonLastNameProperty],
           [self recordID]];
+#endif  // GTM_IPHONE_SDK
 }
 
 + (NSString *)localizedPropertyName:(GTMABPropertyID)property {
@@ -746,10 +754,17 @@ typedef struct {
 }
 
 - (NSString *)description {
+#if GTM_IPHONE_SDK
   return [NSString stringWithFormat:@"%@ %@ %d", 
           [self class], 
           [self valueForProperty:kABGroupNameProperty],
           [self recordID]];
+#else  // GTM_IPHONE_SDK
+  return [NSString stringWithFormat:@"%@ %@ %@", 
+          [self class], 
+          [self valueForProperty:kABGroupNameProperty],
+          [self recordID]];
+#endif  // GTM_IPHONE_SDK
 }
 @end
 
diff --git a/AddressBook/GTMABAddressBookTest.m b/AddressBook/GTMABAddressBookTest.m
index 4a7b0ce..0d1a3cd 100644
--- a/AddressBook/GTMABAddressBookTest.m
+++ b/AddressBook/GTMABAddressBookTest.m
@@ -611,7 +611,7 @@ static NSString *const kGTMABTestGroupName = @"GTMABAddressBookTestGroupName";
     if (type == kGTMABDictionaryPropertyType) {
       val = [[NSDictionary alloc] initWithObjectsAndKeys:@"1", @"1", nil];
     } else if (type == kGTMABStringPropertyType) {
-      val = [[NSString alloc] initWithFormat:@"value %d"];
+      val = [[NSString alloc] initWithFormat:@"value %zu", j];
     } else if (type == kGTMABIntegerPropertyType
                || type == kGTMABRealPropertyType ) {
       val = [[NSNumber alloc] initWithInt:143];