Skip to content

Commit a923a0a

Browse files
author
Damien Rambout
committed
Replace all integer string format keys into object format keys (converting values into numbers first)
This is the modern Objc way.
1 parent 88025e5 commit a923a0a

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

‎Sources/OAuth2Client/NXOAuth2AccessToken.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ + (id)tokenFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
238238
result = (__bridge_transfer NSDictionary *)cfResult;
239239

240240
if (status != noErr) {
241-
NSAssert1(status == errSecItemNotFound, @"unexpected error while fetching token from keychain: %d", (int)status);
241+
NSAssert1(status == errSecItemNotFound, @"unexpected error while fetching token from keychain: %@", (int)status);
242242
return nil;
243243
}
244244

@@ -257,7 +257,7 @@ - (void)storeInDefaultKeychainWithServiceProviderName:(NSString *)provider;
257257
nil];
258258
[self removeFromDefaultKeychainWithServiceProviderName:provider];
259259
OSStatus __attribute__((unused)) err = SecItemAdd((__bridge CFDictionaryRef)query, NULL);
260-
NSAssert1(err == noErr, @"error while adding token to keychain: %d", (int)err);
260+
NSAssert1(err == noErr, @"error while adding token to keychain: %@", (int)err);
261261
}
262262

263263
- (void)removeFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
@@ -268,7 +268,7 @@ - (void)removeFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
268268
serviceName, kSecAttrService,
269269
nil];
270270
OSStatus __attribute__((unused)) err = SecItemDelete((__bridge CFDictionaryRef)query);
271-
NSAssert1((err == noErr || err == errSecItemNotFound), @"error while deleting token from keychain: %d", (int)err);
271+
NSAssert1((err == noErr || err == errSecItemNotFound), @"error while deleting token from keychain: %@", @(err));
272272
}
273273

274274
#else
@@ -287,7 +287,7 @@ + (id)tokenFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
287287
NULL,
288288
&item);
289289
if (err != noErr) {
290-
NSAssert1(err == errSecItemNotFound, @"unexpected error while fetching token from keychain: %d", err);
290+
NSAssert1(err == errSecItemNotFound, @"unexpected error while fetching token from keychain: %@", @(err));
291291
return nil;
292292
}
293293

@@ -314,7 +314,7 @@ + (id)tokenFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
314314
SecKeychainItemFreeContent(&list, password);
315315
} else {
316316
// TODO find out why this always works in i386 and always fails on ppc
317-
NSLog(@"Error from SecKeychainItemCopyContent: %d", err);
317+
NSLog(@"Error from SecKeychainItemCopyContent: %@", @(err));
318318
return nil;
319319
}
320320
CFRelease(item);
@@ -336,7 +336,7 @@ OSStatus __attribute__((unused))err = SecKeychainAddGenericPassword(NULL,
336336
[data bytes],
337337
NULL);
338338

339-
NSAssert1(err == noErr, @"error while adding token to keychain: %d", err);
339+
NSAssert1(err == noErr, @"error while adding token to keychain: %@", @(err));
340340
}
341341

342342
- (void)removeFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
@@ -351,14 +351,14 @@ - (void)removeFromDefaultKeychainWithServiceProviderName:(NSString *)provider;
351351
NULL,
352352
NULL,
353353
&item);
354-
NSAssert1((err == noErr || err == errSecItemNotFound), @"error while deleting token from keychain: %d", err);
354+
NSAssert1((err == noErr || err == errSecItemNotFound), @"error while deleting token from keychain: %@", @(err));
355355
if (err == noErr) {
356356
err = SecKeychainItemDelete(item);
357357
}
358358
if (item) {
359359
CFRelease(item);
360360
}
361-
NSAssert1((err == noErr || err == errSecItemNotFound), @"error while deleting token from keychain: %d", err);
361+
NSAssert1((err == noErr || err == errSecItemNotFound), @"error while deleting token from keychain: %@", @(err));
362362
}
363363

364364
#endif

‎Sources/OAuth2Client/NXOAuth2AccountStore.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ + (void)removeFromDefaultKeychain;
643643
serviceName, kSecAttrService,
644644
nil];
645645
OSStatus __attribute__((unused)) err = SecItemDelete((__bridge CFDictionaryRef)query);
646-
NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting token from keychain: %zd", err);
646+
NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting token from keychain: %zd", @(err));
647647

648648
}
649649

@@ -663,7 +663,7 @@ + (NSDictionary *)accountsFromDefaultKeychain;
663663
NULL,
664664
&item);
665665
if (err != noErr) {
666-
NSAssert1(err == errSecItemNotFound, @"Unexpected error while fetching accounts from keychain: %d", err);
666+
NSAssert1(err == errSecItemNotFound, @"Unexpected error while fetching accounts from keychain: %@", @(err));
667667
return nil;
668668
}
669669

@@ -690,7 +690,7 @@ + (NSDictionary *)accountsFromDefaultKeychain;
690690
SecKeychainItemFreeContent(&list, password);
691691
} else {
692692
// TODO find out why this always works in i386 and always fails on ppc
693-
NSLog(@"Error from SecKeychainItemCopyContent: %d", err);
693+
NSLog(@"Error from SecKeychainItemCopyContent: %@", @(err));
694694
return nil;
695695
}
696696
CFRelease(item);
@@ -714,7 +714,7 @@ OSStatus __attribute__((unused))err = SecKeychainAddGenericPassword(NULL,
714714
[data bytes],
715715
NULL);
716716

717-
NSAssert1(err == noErr, @"Error while storing accounts in keychain: %d", err);
717+
NSAssert1(err == noErr, @"Error while storing accounts in keychain: %@", @(err));
718718
}
719719

720720
+ (void)removeFromDefaultKeychain;
@@ -730,14 +730,14 @@ + (void)removeFromDefaultKeychain;
730730
NULL,
731731
NULL,
732732
&item);
733-
NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting accounts from keychain: %d", err);
733+
NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting accounts from keychain: %@", @(err));
734734
if (err == noErr) {
735735
err = SecKeychainItemDelete(item);
736736
}
737737
if (item) {
738738
CFRelease(item);
739739
}
740-
NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting accounts from keychain: %d", err);
740+
NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting accounts from keychain: %@", @(err));
741741
}
742742

743743
#endif

‎Sources/OAuth2Client/NXOAuth2Connection.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ - (void)applyParameters:(NSDictionary *)parameters onRequest:(NSMutableURLReques
237237
NSInputStream *postBodyStream = [[NXOAuth2PostBodyStream alloc] initWithParameters:parameters];
238238

239239
contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@",[(NXOAuth2PostBodyStream *)postBodyStream boundary]];
240-
NSString *contentLength = [NSString stringWithFormat:@"%lld", [(NXOAuth2PostBodyStream *)postBodyStream length]];
240+
NSString *contentLength = [@([(NXOAuth2PostBodyStream *)postBodyStream length]) stringValue];
241241
[aRequest setValue:contentType forHTTPHeaderField:@"Content-Type"];
242242
[aRequest setValue:contentLength forHTTPHeaderField:@"Content-Length"];
243243

@@ -474,7 +474,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection;
474474
}
475475
}
476476

477-
NSString *localizedError = [NSString stringWithFormat:NSLocalizedString(@"HTTP Error: %d", @"NXOAuth2HTTPErrorDomain description"), self.statusCode];
477+
NSString *localizedError = [NSString stringWithFormat:NSLocalizedString(@"HTTP Error: %@", @"NXOAuth2HTTPErrorDomain description"), self.statusCode];
478478
NSDictionary *errorUserInfo = [NSDictionary dictionaryWithObject:localizedError forKey:NSLocalizedDescriptionKey];
479479
NSError *error = [NSError errorWithDomain:NXOAuth2HTTPErrorDomain
480480
code:self.statusCode

‎Sources/OAuth2Client/NXOAuth2Request.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ - (void)applyParameters:(NSDictionary *)someParameters onRequest:(NSMutableURLRe
163163
NSInputStream *postBodyStream = [[NXOAuth2PostBodyStream alloc] initWithParameters:parameters];
164164

165165
NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", [(NXOAuth2PostBodyStream *)postBodyStream boundary]];
166-
NSString *contentLength = [NSString stringWithFormat:@"%llu", [(NXOAuth2PostBodyStream *)postBodyStream length]];
166+
NSString *contentLength = [@([(NXOAuth2PostBodyStream *)postBodyStream length]) stringValue];
167167
[aRequest setValue:contentType forHTTPHeaderField:@"Content-Type"];
168168
[aRequest setValue:contentLength forHTTPHeaderField:@"Content-Length"];
169169

0 commit comments

Comments
 (0)