Stage1b (v2 branch) of clang compiler warning patches.

This commit is contained in:
Euan Thoms committed 2015-11-06 01:29:26 +08:00
1 parent 9d31023724
commit eda84c7b5d
82 files changed
+186 -154

No files matched your search

+4 -4
View File
@@ -399,12 +399,12 @@ static NSArray *childRecordFields = nil;
if (!displayName)
{
if (activeUserIsOwner)
displayName = [self _displayNameFromOwner];
displayName = (NSMutableString *)[self _displayNameFromOwner];
else
{
displayName = [self _displayNameFromSubscriber];
displayName = (NSMutableString *)[self _displayNameFromSubscriber];
if (!displayName)
displayName = [self _displayNameFromOwner];
displayName = (NSMutableString *)[self _displayNameFromOwner];
}
[displayName retain];
}
@@ -852,7 +852,7 @@ static NSArray *childRecordFields = nil;
{
currentID = [ids objectAtIndex: count];
names = [[currentID componentsSeparatedByString: @"/"] objectEnumerator];
deleteObject = self;
deleteObject = (SOGoContentObject *)self;
while ((currentName = [names nextObject]))
{
deleteObject = [deleteObject lookupName: currentName