adium 4071:da5bbdab941f: Fixed some conversion-warnings.
commits at adium.im
commits at adium.im
Tue Jul 26 19:10:19 UTC 2011
details: http://hg.adium.im/adium/rev/da5bbdab941f
revision: 4071:da5bbdab941f
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Tue Jul 26 21:03:47 2011 +0200
Fixed some conversion-warnings.
diffs (176 lines):
diff -r 2c20ac5527b8 -r da5bbdab941f Frameworks/AIUtilities Framework/Source/AIKeychain.m
--- a/Frameworks/AIUtilities Framework/Source/AIKeychain.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIKeychain.m Tue Jul 26 21:03:47 2011 +0200
@@ -792,12 +792,12 @@
if (item) CFRelease(item);
} else {
- NSLog(@"%@: Error in SecKeychainSearchCopyNext(); err is %i",self,err);
+ NSLog(@"%@: Error in SecKeychainSearchCopyNext(); err is %ld", self, (long)err);
}
if (search) CFRelease(search);
} else {
- NSLog(@"%@: Could not create search; err is %i",self,err);
+ NSLog(@"%@: Could not create search; err is %ld", self, (long)err);
}
return result;
diff -r 2c20ac5527b8 -r da5bbdab941f Frameworks/AIUtilities Framework/Source/AISystemNetworkDefaults.m
--- a/Frameworks/AIUtilities Framework/Source/AISystemNetworkDefaults.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISystemNetworkDefaults.m Tue Jul 26 21:03:47 2011 +0200
@@ -118,7 +118,7 @@
NSDictionary *userInfo = [error userInfo];
NSLog(@"Could not get username and password for proxy: %@ returned %ld (%@)",
[userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME],
- [error code],
+ (long)[error code],
[userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
}
}
diff -r 2c20ac5527b8 -r da5bbdab941f Frameworks/AIUtilities Framework/Source/AITableViewAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AITableViewAdditions.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AITableViewAdditions.m Tue Jul 26 21:03:47 2011 +0200
@@ -52,7 +52,7 @@
- (void)selectItemsInArray:(NSArray *)selectedItems usingSourceArray:(NSArray *)sourceArray
{
if ([sourceArray count] != [self numberOfRows]) {
- NSLog(@"SourceArray is %lu; rows is %ld",[sourceArray count],[self numberOfRows]);
+ NSLog(@"SourceArray is %lu; rows is %ld",(unsigned long)[sourceArray count], (long)[self numberOfRows]);
}
NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
diff -r 2c20ac5527b8 -r da5bbdab941f Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m
--- a/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m Tue Jul 26 21:03:47 2011 +0200
@@ -457,7 +457,7 @@
if(*ch == '-') {
++ch;
month_or_week = read_segment_2digits(ch, &ch);
- NSLog(@"(%@) month is %lu", str, month_or_week);
+ NSLog(@"(%@) month is %lu", str, (unsigned long)month_or_week);
}
day = 1U;
diff -r 2c20ac5527b8 -r da5bbdab941f Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.m
--- a/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterEngine.m Tue Jul 26 21:03:47 2011 +0200
@@ -666,7 +666,7 @@
// Display headers for debugging.
NSHTTPURLResponse *noResp = (NSHTTPURLResponse *)response;
NSLog(@"(%ld) [%@]:\r%@",
- [noResp statusCode],
+ (long)[noResp statusCode],
[NSHTTPURLResponse localizedStringForStatusCode:[noResp statusCode]],
[noResp allHeaderFields]);
}
@@ -702,7 +702,7 @@
if (NO) {
// Dump data as string for debugging.
NSString *dataString = [NSString stringWithUTF8String:[receivedData bytes]];
- NSLog(@"Succeeded! Received %lu bytes of data:\r\r%@", [receivedData length], dataString);
+ NSLog(@"Succeeded! Received %lu bytes of data:\r\r%@", (unsigned long)[receivedData length], dataString);
}
if (NO) {
diff -r 2c20ac5527b8 -r da5bbdab941f Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Source/AdiumPasswords.m Tue Jul 26 21:03:47 2011 +0200
@@ -92,7 +92,7 @@
*/
if (inPassword || (err != errSecItemNotFound)) {
NSDictionary *userInfo = [error userInfo];
- NSLog(@"could not %@ password for account %@: %@ returned %i (%@)", inPassword ? @"set" : @"remove", [self _accountNameForAccount:inAccount], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
+ NSLog(@"could not %@ password for account %@: %@ returned %ld (%@)", inPassword ? @"set" : @"remove", [self _accountNameForAccount:inAccount], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], (long)err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
}
}
}
@@ -118,7 +118,7 @@
*/
if (err != errSecItemNotFound) {
NSDictionary *userInfo = [error userInfo];
- NSLog(@"could not delete password for account %@: %@ returned %i (%@)", [self _accountNameForAccount:inAccount], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
+ NSLog(@"could not delete password for account %@: %@ returned %ld (%@)", [self _accountNameForAccount:inAccount], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], (long)err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
}
}
}
@@ -145,7 +145,7 @@
*/
if (err != errSecItemNotFound) {
NSDictionary *userInfo = [error userInfo];
- NSLog(@"could not retrieve password for account %@: %@ returned %i (%@)", [self _accountNameForAccount:inAccount], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
+ NSLog(@"could not retrieve password for account %@: %@ returned %ld (%@)", [self _accountNameForAccount:inAccount], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], (long)err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
}
}
return password;
@@ -258,12 +258,12 @@
*/
if (inPassword || (err != errSecItemNotFound)) {
NSDictionary *userInfo = [error userInfo];
- NSLog(@"could not %@ password for proxy server %@: %@ returned %i (%@)",
+ NSLog(@"could not %@ password for proxy server %@: %@ returned %ld (%@)",
inPassword ? @"set" : @"remove",
[self _accountNameForProxyServer:server
userName:userName],
[userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME],
- err,
+ (long)err,
[userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
}
}
@@ -292,11 +292,11 @@
*/
if (err != errSecItemNotFound) {
NSDictionary *userInfo = [error userInfo];
- NSLog(@"could not retrieve password for proxy server %@: %@ returned %i (%@)",
+ NSLog(@"could not retrieve password for proxy server %@: %@ returned %ld (%@)",
[self _accountNameForProxyServer:server
userName:userName],
[userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME],
- err,
+ (long)err,
[userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
}
}
diff -r 2c20ac5527b8 -r da5bbdab941f Source/AdiumSound.m
--- a/Source/AdiumSound.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Source/AdiumSound.m Tue Jul 26 21:03:47 2011 +0200
@@ -85,7 +85,7 @@
OSStatus err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &audioAddress, systemOutputDeviceDidChange, self);
if (err != noErr)
- NSLog(@"%s: Couldn't sign up for system-output-device-changed notification, because AudioHardwareAddPropertyListener returned %i. Adium will not know when the default system audio device changes.", __PRETTY_FUNCTION__, err);
+ NSLog(@"%s: Couldn't sign up for system-output-device-changed notification, because AudioHardwareAddPropertyListener returned %ld. Adium will not know when the default system audio device changes.", __PRETTY_FUNCTION__, (long)err);
}
return self;
@@ -247,7 +247,7 @@
};
err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &dataSize, &systemOutputDevice);
if (err != noErr) {
- NSLog(@"%s: Could not get the system output device: AudioHardwareGetProperty returned error %i", __PRETTY_FUNCTION__, err);
+ NSLog(@"%s: Could not get the system output device: AudioHardwareGetProperty returned error %ld", __PRETTY_FUNCTION__, (long)err);
return NULL;
}
@@ -263,7 +263,7 @@
err = AudioObjectGetPropertyData(systemOutputDevice, &uidAddress, 0, NULL, &dataSize, &deviceUID);
if (err != noErr) {
- NSLog(@"%s: Could not get the device UID for device %u: AudioDeviceGetProperty returned error %i", __PRETTY_FUNCTION__, systemOutputDevice, err);
+ NSLog(@"%s: Could not get the device UID for device %ld: AudioDeviceGetProperty returned error %ld", __PRETTY_FUNCTION__, (unsigned long)systemOutputDevice, (long)err);
return NULL;
}
[(NSString *)deviceUID autorelease];
diff -r 2c20ac5527b8 -r da5bbdab941f Source/ESiTunesPlugin.m
--- a/Source/ESiTunesPlugin.m Tue Jul 26 18:26:23 2011 +0200
+++ b/Source/ESiTunesPlugin.m Tue Jul 26 21:03:47 2011 +0200
@@ -301,7 +301,7 @@
nil]]];
} else {
NSLog(@"iTunesValues was %@ (%lu items), but I was expecting %lu. Perhaps CurrentTunes is not updated to match ESiTunesPlugin?",
- iTunesValues, [iTunesValues count], infoCount);
+ iTunesValues, (unsigned long)[iTunesValues count], (unsigned long)infoCount);
}
} else {
More information about the commits
mailing list