Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:robbiehanson/CocoaLumberjack

  • Loading branch information...
commit 610dca4badaf4b0140d2cc9c3532f04cdc308e76 2 parents 9848441 + 29f6235
@robbiehanson robbiehanson authored
View
18 Lumberjack/DDFileLogger.m
@@ -1042,16 +1042,14 @@ - (NSTimeInterval)age
- (NSString *)description
{
- return [[NSDictionary dictionaryWithObjectsAndKeys:
- self.filePath, @"filePath",
- self.fileName, @"fileName",
- self.fileAttributes, @"fileAttributes",
- self.creationDate, @"creationDate",
- self.modificationDate, @"modificationDate",
- [NSNumber numberWithUnsignedLongLong:self.fileSize], @"fileSize",
- [NSNumber numberWithDouble:self.age], @"age",
- [NSNumber numberWithBool:self.isArchived], @"isArchived",
- nil] description];
+ return [@{@"filePath": self.filePath,
+ @"fileName": self.fileName,
+ @"fileAttributes": self.fileAttributes,
+ @"creationDate": self.creationDate,
+ @"modificationDate": self.modificationDate,
+ @"fileSize": @(self.fileSize),
+ @"age": @(self.age),
+ @"isArchived": @(self.isArchived)} description];
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
View
6 Lumberjack/Extensions/ContextFilterLogFormatter.m
@@ -148,7 +148,7 @@ - (void)addToSet:(int)loggingContext
{
OSSpinLockLock(&lock);
{
- [set addObject:[NSNumber numberWithInt:loggingContext]];
+ [set addObject:@(loggingContext)];
}
OSSpinLockUnlock(&lock);
}
@@ -157,7 +157,7 @@ - (void)removeFromSet:(int)loggingContext
{
OSSpinLockLock(&lock);
{
- [set removeObject:[NSNumber numberWithInt:loggingContext]];
+ [set removeObject:@(loggingContext)];
}
OSSpinLockUnlock(&lock);
}
@@ -181,7 +181,7 @@ - (BOOL)isInSet:(int)loggingContext
OSSpinLockLock(&lock);
{
- result = [set containsObject:[NSNumber numberWithInt:loggingContext]];
+ result = [set containsObject:@(loggingContext)];
}
OSSpinLockUnlock(&lock);
View
2  Lumberjack/Extensions/DispatchQueueLogFormatter.m
@@ -166,7 +166,7 @@ - (NSString *)queueThreadLabelForLogMessage:(DDLogMessage *)logMessage
NSString *abrvLabel;
if (useQueueLabel)
- fullLabel = [NSString stringWithUTF8String:logMessage->queueLabel];
+ fullLabel = @(logMessage->queueLabel);
else
fullLabel = logMessage->threadName;
Please sign in to comment.
Something went wrong with that request. Please try again.