Correct many format strings.
--- a/Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m Sat Jun 09 19:38:31 2012 -0400
@@ -286,7 +286,7 @@
if ([self length] && [self containsAttachments]) {
NSInteger currentLocation = 0;
- NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",NSAttachmentCharacter];
+ NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C", (unichar)NSAttachmentCharacter]; attachmentRange = [[self string] rangeOfString:attachmentCharacterString
--- a/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Sat Jun 09 19:38:31 2012 -0400
@@ -355,10 +355,10 @@
//build the strings for the parts
//Note: after checking with a linguistics student, it appears that we're fine leaving it as w, h, etc... rather than localizing.
- weeksString = [NSString stringWithFormat: @"%iw",weeks];
- daysString = [NSString stringWithFormat: @"%id",days];
- hoursString = [NSString stringWithFormat: @"%ih",hours];
- minutesString = [NSString stringWithFormat: @"%im",minutes];
+ weeksString = [NSString stringWithFormat: @"%liw",weeks]; + daysString = [NSString stringWithFormat: @"%lid",days]; + hoursString = [NSString stringWithFormat: @"%lih",hours]; + minutesString = [NSString stringWithFormat: @"%lim",minutes]; secondsString = [NSString stringWithFormat: @"%.0fs",seconds];
weeksString = (weeks == 1) ? ONE_WEEK : [NSString stringWithFormat:MULTIPLE_WEEKS, weeks];
@@ -468,7 +468,7 @@
[newFormat appendString:@"%Y"];
- [newFormat appendFormat:@"%%%iY", [span length]];
+ [newFormat appendFormat:@"%%%liY", [span length]]; --- a/Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m Sat Jun 09 19:38:31 2012 -0400
@@ -56,7 +56,7 @@
- (NSString *)description
- NSMutableString *desc = [[NSMutableString alloc] initWithFormat:@"<%@: %x: ", NSStringFromClass([self class]), self];
+ NSMutableString *desc = [[NSMutableString alloc] initWithFormat:@"<%@: %p: ", NSStringFromClass([self class]), self]; for (id object in self) {
--- a/Frameworks/AIUtilities Framework/Source/AIRichTextCoercer.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIRichTextCoercer.m Sat Jun 09 19:38:31 2012 -0400
@@ -55,8 +55,7 @@
- enum { RIGHTWARDS_ARROW = 0x2192 };
- NSLog(@"%s: Input '%@' %C Class %@ %C Result '%@'", __PRETTY_FUNCTION__, input, RIGHTWARDS_ARROW, class, RIGHTWARDS_ARROW, result);
+ NSLog(@"%s: Input '%@' → Class %@ → Result '%@'", __PRETTY_FUNCTION__, input, class, result); --- a/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Sat Jun 09 19:38:31 2012 -0400
@@ -187,7 +187,7 @@
for (i = 0 ; i < length ; i++) {
/* Offset by the desired amount */
- [newString appendFormat:@"%C",([self characterAtIndex:i] + offset)];
+ [newString appendFormat:@"%C",(unichar)([self characterAtIndex:i] + offset)]; @@ -755,7 +755,7 @@
//^-----^ <-Returns this substring. (Trailing zeroes are deleted.)
//^^ <-Returns this substring (everything before the decimal point) for a whole number.
- NSString *format = numDigits ? [NSString stringWithFormat:@"%%.%uf", numDigits] : @"%f";
+ NSString *format = numDigits ? [NSString stringWithFormat:@"%%.%luf", numDigits] : @"%f"; NSString *str = [NSString stringWithFormat:format, (double)f];
NSUInteger i = [str length];
--- a/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.m Sat Jun 09 19:38:31 2012 -0400
@@ -49,9 +49,9 @@
str = [str stringByAppendingString:@"Z"];
- str = [str stringByAppendingFormat:@"-%02d:%02d", -offset / 60, -offset % 60];
+ str = [str stringByAppendingFormat:@"-%02ld:%02ld", -offset / 60, -offset % 60]; - str = [str stringByAppendingFormat:@"+%02d:%02d", offset / 60, offset % 60];
+ str = [str stringByAppendingFormat:@"+%02ld:%02ld", offset / 60, offset % 60]; @@ -109,7 +109,7 @@
- return [NSString stringWithFormat:@"%u-W%02u-%02u%@", year, week, dayOfWeek + 1U, timeString];
+ return [NSString stringWithFormat:@"%lu-W%02lu-%02lu%@", year, week, dayOfWeek + 1U, timeString]; - (NSString *)ISO8601OrdinalDateStringWithTime:(BOOL)includeTime timeSeparator:(unichar)timeSep {
@@ -119,7 +119,7 @@
- return [NSString stringWithFormat:@"%u-%03u%@", [self yearOfCommonEra], [self dayOfYear], timeString];
+ return [NSString stringWithFormat:@"%lu-%03lu%@", [self yearOfCommonEra], [self dayOfYear], timeString]; --- a/Frameworks/Adium Framework/Source/AIAddressBookController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m Sat Jun 09 19:38:31 2012 -0400
@@ -210,7 +210,7 @@
[fileManager trashFileAtPath:[pluginDirectory stringByAppendingPathComponent:
[NSString stringWithFormat:@"%@-Adium.scpt",name]]];
- AILogWithSignature(@"Warning: Could not find %@",self, fullName);
+ AILogWithSignature(@"Warning: %@ Could not find %@",self, fullName); --- a/Frameworks/Adium Framework/Source/AIChat.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIChat.m Sat Jun 09 19:38:31 2012 -0400
@@ -79,7 +79,7 @@
pendingOutgoingContentObjects = [[NSMutableArray alloc] init];
- AILog(@"[AIChat: %x initForAccount]",self);
+ AILog(@"[AIChat: %p initForAccount]",self); [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(contentObjectAdded:)
@@ -842,7 +842,7 @@
[account setTopic:inTopic forChat:self];
- AILogWithSignature(@"Attempt to set %@ topic when account doesn't support it.");
+ AILogWithSignature(@"Attempt to set %@ topic when account doesn't support it.", self); --- a/Frameworks/Adium Framework/Source/AIEmoticon.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIEmoticon.m Sat Jun 09 19:38:31 2012 -0400
@@ -208,7 +208,7 @@
- (NSString *)description
- return [NSString stringWithFormat:@"%@<%x> (Equivalents: %@) [in %@]",name,self,[self textEquivalents],pack];
+ return [NSString stringWithFormat:@"%@<%p> (Equivalents: %@) [in %@]",name,self,[self textEquivalents],pack]; --- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sat Jun 09 19:38:31 2012 -0400
@@ -628,7 +628,7 @@
if (!UCIsSurrogateLowCharacter(lowSurrogate)) {
//In case you're wondering: 0xFFFF is not a low surrogate. (Nor anything else, for that matter.)
- AILog(@"AIHTMLDecoder: Got high surrogate of surrogate pair, but there's no low surrogate after it. This is at index %u of chunk with length %u. The chunk is: %@", i, length, chunk);
+ AILog(@"AIHTMLDecoder: Got high surrogate of surrogate pair, but there's no low surrogate after it. This is at index %lu of chunk with length %lu. The chunk is: %@", i, length, chunk); UnicodeScalarValue codePoint = UCGetUnicodeScalarValueForSurrogatePair(/*highSurrogate*/ currentChar, lowSurrogate);
@@ -1392,14 +1392,14 @@
NSScanner *hexScanner = [NSScanner scannerWithString:hexString];
unsigned int character = 0;
if([hexScanner scanHexInt:&character])
- [attrString appendString:[NSString stringWithFormat:@"%C", character]
+ [attrString appendString:[NSString stringWithFormat:@"%C", (unichar)character] withAttributes:[textAttributes dictionary]];
} else if ([chunkString hasPrefix:@"#"]) {
NSString *decString = [chunkString substringFromIndex:1];
NSScanner *decScanner = [NSScanner scannerWithString:decString];
if([decScanner scanInt:&character])
- [attrString appendString:[NSString stringWithFormat:@"%C", character]
+ [attrString appendString:[NSString stringWithFormat:@"%C", (unichar)character] withAttributes:[textAttributes dictionary]];
@@ -1942,14 +1942,14 @@
NSSize imageSize = [attachmentImage size];
[string appendFormat:@"<img %@src=\"%@%@\" alt=\"%@\" width=\"%i\" height=\"%i\">",
- srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%i", [[NSDate date] timeIntervalSince1970]] : @""),
+ srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%f", [[NSDate date] timeIntervalSince1970]] : @""), (int)imageSize.width, (int)imageSize.height];
[string appendFormat:@"<img %@src=\"%@%@\" alt=\"%@\">",
- srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%i", [[NSDate date] timeIntervalSince1970]] : @""),
+ srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%f", [[NSDate date] timeIntervalSince1970]] : @""), --- a/Frameworks/Adium Framework/Source/AIListBookmark.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.m Sat Jun 09 19:38:31 2012 -0400
@@ -431,7 +431,7 @@
- (NSString *)description
- return [NSString stringWithFormat:@"<%@:%x %@ - %@ on %@ in %@>",NSStringFromClass([self class]), self, self.formattedUID, [self chatCreationDictionary], self.account, self.remoteGroups];
+ return [NSString stringWithFormat:@"<%@:%p %@ - %@ on %@ in %@>",NSStringFromClass([self class]), self, self.formattedUID, [self chatCreationDictionary], self.account, self.remoteGroups]; --- a/Frameworks/Adium Framework/Source/AIListObject.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIListObject.m Sat Jun 09 19:38:31 2012 -0400
@@ -228,7 +228,7 @@
* Dropping between Away Contact and Offline Contact should make an Away Contact be > 120 but an Offline Contact be < 110.
* Only the sort controller knows the answer as to where this contact should be positioned in the end.
- AILogWithSignature(@"%@: Moving %@ into %@'s index %i using order index %f (between %@ and %@)",
+ AILogWithSignature(@"%@: Moving %@ into %@'s index %li using order index %f (between %@ and %@)", container, listObject, container.visibleContainedObjects, idx,
(nextHighest + nextLowest) / 2, nextObject, previousObject);
[container listObject: listObject didSetOrderIndex: (nextHighest + nextLowest) / 2];
@@ -788,7 +788,7 @@
- (NSString *)description
- return [NSString stringWithFormat:@"<%@:%x %@>",NSStringFromClass([self class]), self, self.internalObjectID];
+ return [NSString stringWithFormat:@"<%@:%p %@>",NSStringFromClass([self class]), self, self.internalObjectID]; --- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Sat Jun 09 19:38:31 2012 -0400
@@ -1100,7 +1100,7 @@
[self.enclosingScrollView setBackgroundColor:[NSColor controlBackgroundColor]];
- NSString *counterText = [NSString stringWithFormat:@"%d", currentCount];
+ NSString *counterText = [NSString stringWithFormat:@"%ld", currentCount]; if (characterCounterPrefix) {
counterText = [NSString stringWithFormat:@"%@%@", characterCounterPrefix, counterText];
@@ -1563,7 +1563,7 @@
NSUInteger currentLocation = 0;
- NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",NSAttachmentCharacter];
+ NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",(unichar)NSAttachmentCharacter]; attachmentRange = [[attributedString string] rangeOfString:attachmentCharacterString
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m Sat Jun 09 19:38:31 2012 -0400
@@ -1081,7 +1081,7 @@
NSString *subobjectDescsDesc = [subobjectDescs description];
- return [NSString stringWithFormat:@"<%@:%x %@: %@>",NSStringFromClass([self class]), self, self.internalObjectID, subobjectDescsDesc];
+ return [NSString stringWithFormat:@"<%@:%p %@: %@>",NSStringFromClass([self class]), self, self.internalObjectID, subobjectDescsDesc]; - (BOOL) canContainObject:(id)obj
--- a/Frameworks/Adium Framework/Source/AISoundSet.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AISoundSet.m Sat Jun 09 19:38:31 2012 -0400
@@ -358,6 +358,6 @@
- (NSString *)description
- return [NSString stringWithFormat:@"<%@: %x - %@: %i sounds at %@>", NSStringFromClass([self class]), self, self.name, [self.sounds count], sourcePath];
+ return [NSString stringWithFormat:@"<%@: %p - %@: %li sounds at %@>", NSStringFromClass([self class]), self, self.name, [self.sounds count], sourcePath]; --- a/Frameworks/Adium Framework/Source/AIStatusItem.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIStatusItem.m Sat Jun 09 19:38:31 2012 -0400
@@ -268,7 +268,7 @@
- (NSString *)description
- return [NSString stringWithFormat:@"<%@: %x [%@]>",
+ return [NSString stringWithFormat:@"<%@: %p [%@]>", NSStringFromClass([self class]),
[[self title] stringWithEllipsisByTruncatingToLength:20]];
--- a/Frameworks/Adium Framework/Source/AITextAttachmentExtension.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AITextAttachmentExtension.m Sat Jun 09 19:38:31 2012 -0400
@@ -270,7 +270,7 @@
- (NSString *)description
- return [NSString stringWithFormat:@"%@<%x>: %@",NSStringFromClass([self class]),self,[super description]];
+ return [NSString stringWithFormat:@"%@<%p>: %@",NSStringFromClass([self class]),self,[super description]]; --- a/Frameworks/Adium Framework/Source/AIWindowController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIWindowController.m Sat Jun 09 19:38:31 2012 -0400
@@ -147,7 +147,7 @@
//Fall back on the old number-of-screens key
- frameString = [adium.preferenceController preferenceForKey:[NSString stringWithFormat:@"%@-%i",key,[[NSScreen screens] count]]
+ frameString = [adium.preferenceController preferenceForKey:[NSString stringWithFormat:@"%@-%li",key,[[NSScreen screens] count]] group:PREF_GROUP_WINDOW_POSITIONS];
//Fall back on the single screen preference if necessary (this is effectively a preference upgrade).
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m Sat Jun 09 19:38:31 2012 -0400
@@ -131,9 +131,9 @@
- (void)setAttributeNames:(NSArray *)newAttrNames values:(NSArray *)newAttrVals
- NSAssert2([newAttrNames count] == [newAttrVals count], @"Attribute names and values have different lengths, %ui and %ui respectively", [newAttrNames count], [newAttrVals count]);
+ NSAssert2([newAttrNames count] == [newAttrVals count], @"Attribute names and values have different lengths, %lu and %lu respectively", [newAttrNames count], [newAttrVals count]); NSUInteger numberOfDuplicates = [newAttrNames count] - [[NSSet setWithArray:newAttrNames] count];
- NSAssert1(numberOfDuplicates == 0, @"Duplicate attributes are not allowed; found %ui duplicate(s)", numberOfDuplicates);
+ NSAssert1(numberOfDuplicates == 0, @"Duplicate attributes are not allowed; found %lu duplicate(s)", numberOfDuplicates); [attributeNames setArray:newAttrNames];
[attributeValues setArray:newAttrVals];
--- a/Frameworks/Adium Framework/Source/AIXtraInfo.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIXtraInfo.m Sat Jun 09 19:38:31 2012 -0400
@@ -45,7 +45,7 @@
- (NSString *) description
- return [NSString stringWithFormat:@"%@, %@, %@, retaincount=%lu", [self name], [self path], [self type], 0];
+ return [NSString stringWithFormat:@"%@, %@, %@, retaincount=%u", [self name], [self path], [self type], 0]; + (AIXtraInfo *) infoWithURL:(NSURL *)url
--- a/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Sat Jun 09 19:38:31 2012 -0400
@@ -474,7 +474,7 @@
NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:NULL];
if (attributes && [attributes objectForKey:NSFilePosixPermissions]) {
NSNumber *posixInfo = [attributes objectForKey:NSFilePosixPermissions];
- posixFlags = [NSString stringWithFormat:@"%X", [posixInfo longValue]];
+ posixFlags = [NSString stringWithFormat:@"%lX", [posixInfo longValue]]; --- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Sat Jun 09 19:38:31 2012 -0400
@@ -386,7 +386,7 @@
CC_SHA1_Update(&ctx, [JPEGData bytes], (CC_LONG)[JPEGData length]);
CC_SHA1_Final(digest, &ctx);
imagehash = [NSData dataWithBytes:digest length:20];
- AILogWithSignature(@"Will update with hash %@; length is %u", imagehash, [JPEGData length]);
+ AILogWithSignature(@"Will update with hash %@; length is %lu", imagehash, [JPEGData length]); [[client client] reportError:@"Error adding image record" ofLevel:AWEzvWarning];
@@ -937,7 +937,7 @@
[self breakdownServiceController];
- AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %d and data %s\n",
+ AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %ld and data %s\n", DNSServiceRefSockFD(info), err, type, data);
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Sat Jun 09 19:38:31 2012 -0400
@@ -595,7 +595,7 @@
hexdata[[(NSData *)value length] * 2] = '\0';
- [infoData appendFormat:@"%c", ([(NSData *)value length] * 2 + [key length] + 1)];
+ [infoData appendFormat:@"%c", (unsigned char)([(NSData *)value length] * 2 + [key length] + 1)]; [infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:[NSString stringWithUTF8String:hexdata]];
@@ -603,7 +603,7 @@
const char *val = [(NSString *)value UTF8String];
NSInteger len = strlen(val);
- [infoData appendFormat:@"%c", len + [key length] + 1];
+ [infoData appendFormat:@"%c", (unsigned char)(len + [key length] + 1)]; [infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:value];
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Sat Jun 09 19:38:31 2012 -0400
@@ -152,6 +152,6 @@
[string appendFormat:@"</%@>", name];
- return [NSString stringWithFormat:@"<AWEzvXMLNode %x:type %i:\"%@\">",self,type,string];
+ return [NSString stringWithFormat:@"<AWEzvXMLNode %p:type %i:\"%@\">",self,type,string]; --- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Sat Jun 09 19:38:31 2012 -0400
@@ -1567,7 +1567,7 @@
NSMutableString *ms = [[NSMutableString alloc] init];
[ms appendString: [NSString stringWithFormat:@"<AsyncSocket %p", self]];
[ms appendString: [NSString stringWithFormat:@" local %@ remote %@ ", selfstr, peerstr]];
- [ms appendString: [NSString stringWithFormat:@"has queued %d reads %d writes, ", [theReadQueue count], [theWriteQueue count] ]];
+ [ms appendString: [NSString stringWithFormat:@"has queued %ld reads %ld writes, ", [theReadQueue count], [theWriteQueue count] ]]; if (theCurrentRead == nil)
[ms appendString: @"no current read, "];
@@ -1580,7 +1580,7 @@
- [ms appendString: [NSString stringWithFormat:@"currently read %u bytes (%d%% done), ",
+ [ms appendString: [NSString stringWithFormat:@"currently read %lu bytes (%d%% done), ", [theCurrentRead->buffer length],
theCurrentRead->bytesDone ? percentDone : 0]];
@@ -1596,7 +1596,7 @@
- [ms appendString: [NSString stringWithFormat:@"currently written %u (%d%%), ",
+ [ms appendString: [NSString stringWithFormat:@"currently written %lu (%d%%), ", [theCurrentWrite->buffer length],
theCurrentWrite->bytesDone ? percentDone : 0]];
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Sat Jun 09 19:38:31 2012 -0400
@@ -362,7 +362,7 @@
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1);
[self setHeaderFields:response forURI:[uri relativeString] appleSingle: isAppleSingle keepAlive:isKeepAlive];
- NSString *contentLength = [NSString stringWithFormat:@"%i", [data length]];
+ NSString *contentLength = [NSString stringWithFormat:@"%li", [data length]]; CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (__bridge CFStringRef)contentLength);
//NSDictionary *responseHeaders = [(NSDictionary *)CFHTTPMessageCopyAllHeaderFields(response) autorelease];
--- a/Plugins/Error Message Handler/ErrorMessageWindowController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Error Message Handler/ErrorMessageWindowController.m Sat Jun 09 19:38:31 2012 -0400
@@ -161,7 +161,7 @@
[[self window] makeFirstResponder:button_okay];
[button_dismissAll setHidden:NO];
- [[self window] setTitle:[NSString stringWithFormat:@"%@ (x%i)",[errorWindowTitleArray objectAtIndex:0],[errorTitleArray count]]];
+ [[self window] setTitle:[NSString stringWithFormat:@"%@ (x%li)",[errorWindowTitleArray objectAtIndex:0],[errorTitleArray count]]]; [button_okay setTitle:AILocalizedString(@"Next",nil)];
[button_dismissAll setTitle:AILocalizedString(@"Dismiss All", @"Used in the error window; closes all open errors.")];
[[self window] makeFirstResponder:button_dismissAll];
--- a/Plugins/Purple Service/AMPurpleSearchResultsController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/AMPurpleSearchResultsController.m Sat Jun 09 19:38:31 2012 -0400
@@ -93,7 +93,7 @@
for(column = results->columns; column; column = g_list_next(column)) {
PurpleNotifySearchColumn *scol = column->data;
- NSTableColumn *tcol = [[NSTableColumn alloc] initWithIdentifier:[NSString stringWithFormat:@"%d", idx++]];
+ NSTableColumn *tcol = [[NSTableColumn alloc] initWithIdentifier:[NSString stringWithFormat:@"%ld", idx++]]; [[tcol headerCell] setStringValue:[NSString stringWithUTF8String:scol->title]];
--- a/Plugins/Purple Service/AMPurpleTuneTooltip.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/AMPurpleTuneTooltip.m Sat Jun 09 19:38:31 2012 -0400
@@ -81,7 +81,7 @@
[text appendFormat:@" (%@)", [NSString stringWithUTF8String:albumstr]];
- [text appendFormat:@" - [%d:%02d]", timeval / 60, timeval % 60];
+ [text appendFormat:@" - [%ld:%02ld]", timeval / 60, timeval % 60]; return [AIHTMLDecoder decodeHTML:text];
--- a/Plugins/Purple Service/CBPurpleAccount.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/CBPurpleAccount.m Sat Jun 09 19:38:31 2012 -0400
@@ -103,7 +103,7 @@
//Create a purple account if one does not already exist
[self createNewPurpleAccount];
- AILog(@"Created PurpleAccount 0x%x with UID %@, protocolPlugin %s", account, self.UID, [self protocolPlugin]);
+ AILog(@"Created PurpleAccount %p with UID %@, protocolPlugin %s", account, self.UID, [self protocolPlugin]); @@ -1578,7 +1578,7 @@
if (account->perm_deny != privacyType) {
account->perm_deny = privacyType;
serv_set_permit_deny(purple_account_get_connection(account));
- AILog(@"Set privacy options for %@ (%x %x) to %i",
+ AILog(@"Set privacy options for %@ (%p %p) to %i", self,account,purple_account_get_connection(account),account->perm_deny);
[self setPreference:[NSNumber numberWithInteger:option]
@@ -1586,7 +1586,7 @@
group:GROUP_ACCOUNT_STATUS];
- AILog(@"Couldn't set privacy options for %@ (%x %x)",self,account,purple_account_get_connection(account));
+ AILog(@"Couldn't set privacy options for %@ (%p %p)",self,account,purple_account_get_connection(account)); @@ -2050,7 +2050,7 @@
[self notifyOfChangedPropertiesSilently:NO];
- AILog(@"************ %@ --step-- %i",self.UID,[step integerValue]);
+ AILog(@"************ %@ --step-- %li",self.UID,[step integerValue]); @@ -2080,7 +2080,7 @@
//-[SLPurpleCocoaAdapter addAdiumAccount:] should have immediately called back on setPurpleAccount. It's bad if it didn't.
- AILog(@"Created PurpleAccount 0x%x with UID %@ and protocolPlugin %s", account, self.UID, [self protocolPlugin]);
+ AILog(@"Created PurpleAccount %p with UID %@ and protocolPlugin %s", account, self.UID, [self protocolPlugin]); AILog(@"Unable to create Libpurple account with name %s and protocol plugin %s",
self.purpleAccountName, [self protocolPlugin]);
@@ -2607,7 +2607,7 @@
* to nil and we'll continue below to convert the image. */
buddyIconData = imageData;
- AILog(@"%@: Trying to use original GIF data, %i bytes", self, [buddyIconData length]);
+ AILog(@"%@: Trying to use original GIF data, %li bytes", self, [buddyIconData length]); AILog(@"%@: Failed to use original GIF", self);
@@ -2629,9 +2629,9 @@
if ([buddyIconData length] > maxFileSize) {
buddyIconData = [image JPEGRepresentationWithMaximumByteSize:maxFileSize];
- AILog(@"%@: GIF too large, use a still JPEG of %i bytes", self, [buddyIconData length]);
+ AILog(@"%@: GIF too large, use a still JPEG of %li bytes", self, [buddyIconData length]); - AILog(@"%@: Resized GIF, new file size %i!", self, [buddyIconData length]);
+ AILog(@"%@: Resized GIF, new file size %li!", self, [buddyIconData length]); @@ -2676,7 +2676,7 @@
size_t maxFileSize = prpl_info->icon_spec.max_filesize;
if (maxFileSize > 0 && ([buddyIconData length] > maxFileSize)) {
- AILog(@"%@: Image %i is larger than %i!", self, [buddyIconData length], maxFileSize);
+ AILog(@"%@: Image %li is larger than %zi!", self, [buddyIconData length], maxFileSize); for (i = 0; prpl_formats[i]; i++) {
if ((strcmp(prpl_formats[i],"jpeg") == 0) || (strcmp(prpl_formats[i],"jpg") == 0)) {
@@ -2691,7 +2691,7 @@
- AILogWithSignature(@"%@: Setting icon data of length %i", self, [buddyIconData length]);
+ AILogWithSignature(@"%@: Setting icon data of length %li", self, [buddyIconData length]); [self.purpleAdapter setBuddyIcon:buddyIconData onAccount:self];
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m Sat Jun 09 19:38:31 2012 -0400
@@ -731,9 +731,9 @@
/* purple_imgstore_add_with_id() will take ownership of imgBytes and free it when done*/
NSInteger imgstore = purple_imgstore_add_with_id(imgBytes, imgBytesLength, [filename UTF8String]);
- AILog(@"Adding image id %i with name %s", imgstore, (filename ? [filename UTF8String] : "(null)"));
+ AILog(@"Adding image id %li with name %s", imgstore, (filename ? [filename UTF8String] : "(null)")); - NSString *newTag = [NSString stringWithFormat:@"<IMG ID=\"%i\" CLASS=\"scaledToFitImage\">",imgstore];
+ NSString *newTag = [NSString stringWithFormat:@"<IMG ID=\"%li\" CLASS=\"scaledToFitImage\">",imgstore]; [processedString appendString:newTag];
if (!purpleImagesToUnref) purpleImagesToUnref = [[NSMutableSet alloc] init];
--- a/Plugins/Purple Service/ESPurpleMSNAccount.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.m Sat Jun 09 19:38:31 2012 -0400
@@ -344,7 +344,7 @@
while (friendlyNameUTF8String &&
strlen(purple_url_encode(friendlyNameUTF8String)) > BUDDY_ALIAS_MAXLEN) {
- AILog(@"Shortening because %s (max len %i) [%s] len (%i) > %i",
+ AILog(@"Shortening because %s (max len %li) [%s] len (%zi) > %i", friendlyNameUTF8String, currentMaxNumberOfPreEncodedCharacters,
purple_url_encode(friendlyNameUTF8String),strlen(purple_url_encode(friendlyNameUTF8String)),
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sat Jun 09 19:38:31 2012 -0400
@@ -485,7 +485,7 @@
- errorString = [NSString stringWithFormat:@"conv %x: Got nil chat in lookup for sourceContact %@ (%x ; \"%s\" ; \"%s\") on adiumAccount %@ (%x ; \"%s\")",
+ errorString = [NSString stringWithFormat:@"conv %p: Got nil chat in lookup for sourceContact %@ (%p ; \"%s\" ; \"%s\") on adiumAccount %@ (%p ; \"%s\")", @@ -752,7 +752,7 @@
//If we didn't get a purpleImage, just leave the tag for now.. maybe it was important?
- [newString appendFormat:@"<IMG ID=\"%ld\">",chunkString];
+ [newString appendFormat:@"<IMG ID=\"%@\">",chunkString]; @@ -904,7 +904,7 @@
- (void)disconnectAccount:(id)adiumAccount
PurpleAccount *account = accountLookupFromAdiumAccount(adiumAccount);
- AILog(@"Setting %x disabled and offline (%s)...",account,
+ AILog(@"Setting %p disabled and offline (%s)...",account, purple_status_type_get_id(purple_account_get_status_type_with_primitive(account, PURPLE_STATUS_OFFLINE)));
purple_account_set_enabled(account, "Adium", NO);
@@ -1394,7 +1394,7 @@
PurpleAccount *account = accountLookupFromAdiumAccount(adiumAccount);
GList *attrs = createListFromDictionary(arguments);
- AILog(@"Setting status on %x (%s): ID %s, isActive %i, attributes %@",account, purple_account_get_username(account),
+ AILog(@"Setting status on %p (%s): ID %s, isActive %i, attributes %@",account, purple_account_get_username(account), statusID, [isActive boolValue], arguments);
purple_account_set_status_list(account, statusID, [isActive boolValue], attrs);
--- a/Plugins/Purple Service/adiumPurpleConnection.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/adiumPurpleConnection.m Sat Jun 09 19:38:31 2012 -0400
@@ -21,7 +21,7 @@
if (!PURPLE_CONNECTION_IS_VALID(gc)) return;
- AILog(@"Connecting: gc=0x%x (%s) %ul / %ul", gc, text, step, step_count);
+ AILog(@"Connecting: gc=0x%p (%s) %zul / %zul", gc, text, step, step_count); NSNumber *connectionProgressPrecent = [NSNumber numberWithDouble:((CGFloat)step / (CGFloat)(step_count-1))];
[accountLookup(purple_connection_get_account(gc)) accountConnectionProgressStep:[NSNumber numberWithInteger:step] percentDone:connectionProgressPrecent];
@@ -31,7 +31,7 @@
static void adiumPurpleConnConnected(PurpleConnection *gc)
- AILog(@"Connected: gc=%x", gc);
+ AILog(@"Connected: gc=%p", gc); [accountLookup(purple_connection_get_account(gc)) accountConnectionConnected];
@@ -40,7 +40,7 @@
static void adiumPurpleConnDisconnected(PurpleConnection *gc)
- AILog(@"Disconnected: gc=%x", gc);
+ AILog(@"Disconnected: gc=%p", gc); // if (_accountDict == nil) // if this has been destroyed, unloadPlugin has already been called
[accountLookup(purple_connection_get_account(gc)) accountConnectionDisconnected];
@@ -50,7 +50,7 @@
static void adiumPurpleConnNotice(PurpleConnection *gc, const char *text)
- AILog(@"Connection Notice: gc=%x (%s)", gc, text);
+ AILog(@"Connection Notice: gc=%p (%s)", gc, text); NSString *connectionNotice = [NSString stringWithUTF8String:text];
[accountLookup(purple_connection_get_account(gc)) accountConnectionNotice:connectionNotice];
@@ -72,7 +72,7 @@
- AILog(@"Connection Disconnected: gc=%x (%s)", gc, text);
+ AILog(@"Connection Disconnected: gc=%p (%s)", gc, text); NSString *disconnectError = (text ? [NSString stringWithUTF8String:text] : @"");
[accountLookup(purple_connection_get_account(gc)) accountConnectionReportDisconnect:disconnectError withReason:reason];
--- a/Plugins/Purple Service/adiumPurpleConversation.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/adiumPurpleConversation.m Sat Jun 09 19:38:31 2012 -0400
@@ -539,7 +539,7 @@
const guchar *data, gsize size)
- AILog(@"%s: Write Custom Smiley %s (%x %i)",purple_conversation_get_name(conv),smile,data,size);
+ AILog(@"%s: Write Custom Smiley %s (%p %li)",purple_conversation_get_name(conv),smile,data,size); [accountLookup(purple_conversation_get_account(conv)) chat:chatLookupFromConv(conv)
setCustomEmoticon:[NSString stringWithUTF8String:smile]
--- a/Plugins/Purple Service/adiumPurpleDnsRequest.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/adiumPurpleDnsRequest.m Sat Jun 09 19:38:31 2012 -0400
@@ -126,7 +126,7 @@
- (void)lookupSucceededWithAddresses:(NSArray *)addresses
//Success! Build a list of our results and pass it to the resolved callback
- AILog(@"DNS resolve complete for %s:%d; %d addresses returned",
+ AILog(@"DNS resolve complete for %s:%d; %ld addresses returned", purple_dnsquery_get_host(query_data),
purple_dnsquery_get_port(query_data),
@@ -158,7 +158,7 @@
- (void)lookupFailedWithError:(const CFStreamError *)streamError
- AILogWithSignature(@"Failed lookup for %s. Error domain %i, error %i",
+ AILogWithSignature(@"Failed lookup for %s. Error domain %li, error %i", purple_dnsquery_get_host([self queryData]),
(streamError ? streamError->domain : 0),
(streamError ? streamError->error : 0));
--- a/Plugins/Purple Service/adiumPurpleRequest.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Purple Service/adiumPurpleRequest.m Sat Jun 09 19:38:31 2012 -0400
@@ -385,7 +385,7 @@
* and we do, in fact, want to send. Call the OK callback immediately.
if (xfer->local_filename != NULL && xfer->filename != NULL) {
- AILog(@"PURPLE_XFER_SEND: %x (%s)",xfer,xfer->local_filename);
+ AILog(@"PURPLE_XFER_SEND: %p (%s)",xfer,xfer->local_filename); ((PurpleRequestFileCb)ok_cb)(user_data, xfer->local_filename);
((PurpleRequestFileCb)cancel_cb)(user_data, xfer->local_filename);
--- a/Plugins/Twitter Plugin/AILaconicaAccount.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Twitter Plugin/AILaconicaAccount.m Sat Jun 09 19:38:31 2012 -0400
@@ -195,7 +195,7 @@
- AILogWithSignature(@"Failed fetching StatusNet server config for %@: %d %@", self.host, [err code], [err localizedDescription]);
+ AILogWithSignature(@"Failed fetching StatusNet server config for %@: %ld %@", self.host, [err code], [err localizedDescription]); textLimitConfigDownload = nil;
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Sat Jun 09 19:38:31 2012 -0400
@@ -233,7 +233,7 @@
- AILog(@"%@ Timeline bookmark is nil! Tried checking for existing bookmark for chat name %@, and creating a bookmark for chat %@ in group %@",
+ AILog(@"Timeline bookmark is nil! Tried checking for existing bookmark for chat name %@, and creating a bookmark for chat %@ in group %@", self.timelineChatName, newTimelineChat,
[adium.contactController groupWithUID:self.timelineGroupName]);
@@ -1140,7 +1140,7 @@
if (pendingUpdateCount) {
- AILogWithSignature(@"%@ Update already in progress. Count = %d", self, pendingUpdateCount);
+ AILogWithSignature(@"%@ Update already in progress. Count = %ld", self, pendingUpdateCount); @@ -1699,7 +1699,7 @@
- AILogWithSignature(@"%@ Displaying %d updates", self, queuedUpdates.count);
+ AILogWithSignature(@"%@ Displaying %ld updates", self, queuedUpdates.count); // Sort the queued updates (since we're intermingling pages of data from different souces)
NSArray *sortedQueuedUpdates = [queuedUpdates sortedArrayUsingFunction:queuedUpdatesSort context:nil];
@@ -1772,7 +1772,7 @@
- AILogWithSignature(@"%@ Displaying %d DMs", self, queuedDM.count);
+ AILogWithSignature(@"%@ Displaying %ld DMs", self, queuedDM.count); NSArray *sortedQueuedDM = [*unsortedArray sortedArrayUsingFunction:queuedDMSort context:nil];
@@ -2372,7 +2372,7 @@
- AILogWithSignature(@"%@ User info pull, Users count: %d", self, users.count);
+ AILogWithSignature(@"%@ User info pull, Users count: %ld", self, users.count); for (NSDictionary *user in users) {
--- a/Source/AIDockController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AIDockController.m Sat Jun 09 19:38:31 2012 -0400
@@ -658,7 +658,7 @@
NSInteger contentCount = (showConversationCount ?
[adium.chatController unviewedConversationCount] : [adium.chatController unviewedContentCount]);
if (contentCount > 0 && shouldBadge)
- [dockTile setBadgeLabel:[NSString stringWithFormat:@"%d", contentCount]];
+ [dockTile setBadgeLabel:[NSString stringWithFormat:@"%ld", contentCount]]; [dockTile setBadgeLabel:nil];
--- a/Source/AILogViewerWindowController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AILogViewerWindowController.m Sat Jun 09 19:38:31 2012 -0400
@@ -631,7 +631,7 @@
NSInteger count = [currentSearchResults count];
- AILog(@"refreshResultsSearchIsComplete: %i (count is %i)",searchIsComplete,count);
+ AILog(@"refreshResultsSearchIsComplete: %i (count is %li)",searchIsComplete,count); ((activeSearchID == searchIDToReattemptWhenComplete) && !windowIsClosing)) {
@@ -1079,7 +1079,7 @@
[textView_content scrollRangeToVisible:scrollTo];
[textView_content setSelectedRange:scrollTo];
- [textField_findCount setStringValue:[NSString stringWithFormat:@"%d/%d", currentMatch, [matches count]]];
+ [textField_findCount setStringValue:[NSString stringWithFormat:@"%ld/%ld", currentMatch, [matches count]]]; //Sorting --------------------------------------------------------------------------------------------------------------
@@ -1618,7 +1618,7 @@
theLog = [[logToGroupDict objectForKey:toPath] logAtPath:path];
- AILog(@"_logContentFilter: %x's key %@ yields %@; logAtPath:%@ gives %@",logToGroupDict,toPath,[logToGroupDict objectForKey:toPath],path,theLog);
+ AILog(@"_logContentFilter: %p's key %@ yields %@; logAtPath:%@ gives %@",logToGroupDict,toPath,[logToGroupDict objectForKey:toPath],path,theLog); @@ -1685,7 +1685,7 @@
if (searchID == activeSearchID) { //If we're still supposed to go
- AILogWithSignature(@"Search ID %i: %@", searchID, searchInfoDict);
+ AILogWithSignature(@"Search ID %li: %@", searchID, searchInfoDict); if (searchString && [searchString length]) {
@@ -1711,7 +1711,7 @@
[self performSelectorOnMainThread:@selector(searchComplete) withObject:nil waitUntilDone:NO];
- AILogWithSignature(@"Search ID %i): finished", searchID);
+ AILogWithSignature(@"Search ID %li): finished", searchID); --- a/Source/AILoggerPlugin.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AILoggerPlugin.m Sat Jun 09 19:38:31 2012 -0400
@@ -433,7 +433,7 @@
if ([[NSFileManager defaultManager] fileExistsAtPath:logIndexPath]) {
_index = SKIndexOpenWithURL((__bridge CFURLRef)logIndexURL, (CFStringRef)@"Content", true);
- AILogWithSignature(@"Opened index %x from %@",_index,logIndexURL);
+ AILogWithSignature(@"Opened index %p from %@",_index,logIndexURL); //It appears our index was somehow corrupt, since it exists but it could not be opened. Remove it so we can create a new one.
@@ -463,7 +463,7 @@
(__bridge CFDictionaryRef)textAnalysisProperties);
- AILogWithSignature(@"Created a new log index %x at %@ with textAnalysisProperties %@. Will reindex all logs.",_index,logIndexURL,textAnalysisProperties);
+ AILogWithSignature(@"Created a new log index %p at %@ with textAnalysisProperties %@. Will reindex all logs.",_index,logIndexURL,textAnalysisProperties); //Clear the dirty log set in case it was loaded (this can happen if the user mucks with the cache directory)
[[NSFileManager defaultManager] removeItemAtPath:[bself _dirtyLogSetPath] error:NULL];
dispatch_sync(dirtyLogSetMutationQueue, ^{
@@ -1320,7 +1320,7 @@
__block __typeof__(self) bself = self;
dispatch_sync(dirtyLogSetMutationQueue, ^{
[bself.dirtyLogSet addObjectsFromArray:[NSArray arrayWithContentsOfFile:[bself _dirtyLogSetPath]]];
- AILogWithSignature(@"Loaded dirty log set with %i logs",[bself.dirtyLogSet count]);
+ AILogWithSignature(@"Loaded dirty log set with %li logs",[bself.dirtyLogSet count]); AILogWithSignature(@"**** Log version upgrade. Resetting");
@@ -1443,7 +1443,7 @@
__block UInt32 lastUpdate = TickCount();
__block SInt32 unsavedChanges = 0;
- AILogWithSignature(@"Cleaning %i dirty logs", [localLogSet count]);
+ AILogWithSignature(@"Cleaning %li dirty logs", [localLogSet count]); dispatch_group_async(loggerPluginGroup, searchIndexQueue, blockWithAutoreleasePool(^{
dispatch_group_enter(logIndexingGroup);
while (_remainingLogs > 0 && bself.indexingAllowed) {
@@ -1561,7 +1561,7 @@
[[AILogViewerWindowController existingWindowController] logIndexingProgressUpdate];
[bself _flushIndex:searchIndex];
- AILogWithSignature(@"After cleaning dirty logs, the search index has a max ID of %i and a count of %i",
+ AILogWithSignature(@"After cleaning dirty logs, the search index has a max ID of %li and a count of %li", SKIndexGetMaximumDocumentID(searchIndex),
SKIndexGetDocumentCount(searchIndex));
[bself _didCleanDirtyLogs];
--- a/Source/AIObjectDebug.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AIObjectDebug.m Sat Jun 09 19:38:31 2012 -0400
@@ -50,7 +50,7 @@
NSLog(@"%@ of class %@ does not respond to selector %@", self, [self class], NSStringFromSelector(aSelector));
- __crashreporter_info__ = (char *)[[NSString stringWithFormat:@"Dear crash reporter team: We only put stuff here in debug builds of Adium. Don't Panic, it won't ship in a release unless there's public API for it.\n\n %@ of class %@ does not respond to selector %s", self, [self class], aSelector] cStringUsingEncoding:NSASCIIStringEncoding];
+ __crashreporter_info__ = (char *)[[NSString stringWithFormat:@"Dear crash reporter team: We only put stuff here in debug builds of Adium. Don't Panic, it won't ship in a release unless there's public API for it.\n\n %@ of class %@ does not respond to selector %@", self, [self class], NSStringFromSelector(aSelector)] cStringUsingEncoding:NSASCIIStringEncoding]; --- a/Source/AIPreferenceContainer.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AIPreferenceContainer.m Sat Jun 09 19:38:31 2012 -0400
@@ -153,7 +153,7 @@
NSLog(@"Error reading data for preferences file %@: %@ (%@ %ld: %@)", objectPrefsPath, error,
[error domain], (long)[error code], [error userInfo]);
- AILogWithSignature(@"Error reading data for preferences file %@: %@ (%@ %i: %@)", objectPrefsPath, error,
+ AILogWithSignature(@"Error reading data for preferences file %@: %@ (%@ %li: %@)", objectPrefsPath, error, [error domain], [error code], [error userInfo]);
if ([[NSFileManager defaultManager] fileExistsAtPath:objectPrefsPath]) {
@@ -162,7 +162,7 @@
- AILogWithSignature(@"Error reading data for preferences file %@: %@ (%@ %i: %@)", objectPrefsPath, error,
+ AILogWithSignature(@"Error reading data for preferences file %@: %@ (%@ %li: %@)", objectPrefsPath, error, [error domain], [error code], [error userInfo]);
@@ -184,7 +184,7 @@
#ifdef PREFERENCE_CONTAINER_DEBUG
- AILogWithSignature(@"I read in %@ with %i items", globalPrefsName, [*myGlobalPrefs count]);
+ AILogWithSignature(@"I read in %@ with %li items", globalPrefsName, [*myGlobalPrefs count]); /* If we don't get a dictionary, create a new one */
--- a/Source/AITemporaryIRCAccountWindowController.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AITemporaryIRCAccountWindowController.m Sat Jun 09 19:38:31 2012 -0400
@@ -69,7 +69,7 @@
[textField_explanation setStringValue:[NSString stringWithFormat:AILocalizedString(@"You need to create a new IRC account to connect to irc://%@%@/%@:", nil),
- (port == 6667 ? @"" : [NSString stringWithFormat:@":%d", port]),
+ (port == 6667 ? @"" : [NSString stringWithFormat:@":%ld", port]), [textField_server setStringValue:server];
--- a/Source/AIXMLAppender.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/AIXMLAppender.m Sat Jun 09 19:38:31 2012 -0400
@@ -220,7 +220,7 @@
const char *pathCString = [self.path fileSystemRepresentation];
int fd = open(pathCString, O_CREAT | O_WRONLY, 0600);
- AILog(@"Couldn't open log file %@ (%s - length %u) for writing!",
+ AILog(@"Couldn't open log file %@ (%s - length %zu) for writing!", self.path, pathCString, (pathCString ? strlen(pathCString) : 0));
self.fileHandle = [[NSFileHandle alloc] initWithFileDescriptor:fd closeOnDealloc:YES];
--- a/Source/DCMessageContextDisplayPlugin.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/DCMessageContextDisplayPlugin.m Sat Jun 09 19:38:31 2012 -0400
@@ -315,7 +315,7 @@
//Add our locals to the outer array; we're probably looping again.
- AILog(@"Context: %i messages from %@: %@", foundMessages.count, [xmlFilePath lastPathComponent], foundMessages);
+ AILog(@"Context: %li messages from %@: %@", foundMessages.count, [xmlFilePath lastPathComponent], foundMessages); [outerFoundContentContexts replaceObjectsInRange:NSMakeRange(0, 0) withObjectsFromArray:foundMessages];
linesLeftToFind -= [outerFoundContentContexts count];
@@ -323,7 +323,7 @@
if (linesLeftToFind > 0) {
- AILogWithSignature(@"Unable to find %d logs for %@; we needed %d more", linesToDisplay, chat, linesLeftToFind);
+ AILogWithSignature(@"Unable to find %ld logs for %@; we needed %ld more", linesToDisplay, chat, linesLeftToFind); return outerFoundContentContexts;
--- a/Source/NEHGrowlPlugin.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/NEHGrowlPlugin.m Sat Jun 09 19:38:31 2012 -0400
@@ -327,7 +327,7 @@
overallListObject = [listObjects objectAtIndex:0];
- AILog(@"Posting multiple event - %@ %@ %@ %d", eventID, overallListObject, chat, events.count);
+ AILog(@"Posting multiple event - %@ %@ %@ %ld", eventID, overallListObject, chat, events.count); // Use any random event for sticky.
NSDictionary *anyEventDetails = [[events objectAtIndex:0] objectForKey:@"Details"];
--- a/Source/XtrasInstaller.m Sat Jun 09 18:13:30 2012 -0400
+++ b/Source/XtrasInstaller.m Sat Jun 09 19:38:31 2012 -0400
@@ -120,7 +120,7 @@
downloadSize = [response expectedContentLength];
[progressBar setMaxValue:(long long)downloadSize];
[progressBar setDoubleValue:0.0];
- AILogWithSignature(@"Beginning download of %@, which has size %ll", [response allHeaderFields], downloadSize);
+ AILogWithSignature(@"Beginning download of %@, which has size %lld", [response allHeaderFields], downloadSize);