Skip to content

Commit 612d99c

Browse files
authored
Fix Core CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF warnings (firebase#779)
1 parent bf45a15 commit 612d99c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Firebase/Core/FIRMutableDictionary.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,41 +37,41 @@ - (instancetype)init {
3737
- (NSString *)description {
3838
__block NSString *description;
3939
dispatch_sync(_queue, ^{
40-
description = _objects.description;
40+
description = self->_objects.description;
4141
});
4242
return description;
4343
}
4444

4545
- (id)objectForKey:(id)key {
4646
__block id object;
4747
dispatch_sync(_queue, ^{
48-
object = _objects[key];
48+
object = self->_objects[key];
4949
});
5050
return object;
5151
}
5252

5353
- (void)setObject:(id)object forKey:(id<NSCopying>)key {
5454
dispatch_async(_queue, ^{
55-
_objects[key] = object;
55+
self->_objects[key] = object;
5656
});
5757
}
5858

5959
- (void)removeObjectForKey:(id)key {
6060
dispatch_async(_queue, ^{
61-
[_objects removeObjectForKey:key];
61+
[self->_objects removeObjectForKey:key];
6262
});
6363
}
6464

6565
- (void)removeAllObjects {
6666
dispatch_async(_queue, ^{
67-
[_objects removeAllObjects];
67+
[self->_objects removeAllObjects];
6868
});
6969
}
7070

7171
- (NSUInteger)count {
7272
__block NSUInteger count;
7373
dispatch_sync(_queue, ^{
74-
count = _objects.count;
74+
count = self->_objects.count;
7575
});
7676
return count;
7777
}
@@ -89,7 +89,7 @@ - (void)setObject:(id)obj forKeyedSubscript:(id<NSCopying>)key {
8989
- (NSDictionary *)dictionary {
9090
__block NSDictionary *dictionary;
9191
dispatch_sync(_queue, ^{
92-
dictionary = [_objects copy];
92+
dictionary = [self->_objects copy];
9393
});
9494
return dictionary;
9595
}

Firebase/Core/FIRNetworkURLSession.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,11 @@ - (void)URLSession:(NSURLSession *)session
314314
if (allow) {
315315
completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
316316
} else {
317-
[_loggerDelegate
317+
[self->_loggerDelegate
318318
firNetwork_logWithLevel:kFIRNetworkLogLevelDebug
319319
messageCode:kFIRNetworkMessageCodeURLSession007
320320
message:@"Cancelling authentication challenge for host. Host"
321-
context:_request.URL];
321+
context:self->_request.URL];
322322
completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
323323
}
324324
};
@@ -344,10 +344,10 @@ - (void)URLSession:(NSURLSession *)session
344344
}
345345

346346
if (trustError != errSecSuccess) {
347-
[_loggerDelegate firNetwork_logWithLevel:kFIRNetworkLogLevelError
348-
messageCode:kFIRNetworkMessageCodeURLSession008
349-
message:@"Cannot evaluate server trust. Error, host"
350-
contexts:@[ @(trustError), _request.URL ]];
347+
[self->_loggerDelegate firNetwork_logWithLevel:kFIRNetworkLogLevelError
348+
messageCode:kFIRNetworkMessageCodeURLSession008
349+
message:@"Cannot evaluate server trust. Error, host"
350+
contexts:@[ @(trustError), self->_request.URL ]];
351351
shouldAllow = NO;
352352
} else {
353353
// Having a trust level "unspecified" by the user is the usual result, described at
@@ -651,7 +651,7 @@ - (void)callCompletionHandler:(FIRNetworkURLSessionCompletionHandler)handler
651651

652652
if (handler) {
653653
dispatch_async(dispatch_get_main_queue(), ^{
654-
handler(response, data, _sessionID, error);
654+
handler(response, data, self->_sessionID, error);
655655
});
656656
}
657657
}

Firebase/Core/FIROptions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ - (NSDictionary *)analyticsOptionsDictionaryWithInfoDictionary:(NSDictionary *)i
367367
}
368368
tempAnalyticsOptions[key] = value;
369369
}
370-
_analyticsOptionsDictionary = tempAnalyticsOptions;
370+
self->_analyticsOptionsDictionary = tempAnalyticsOptions;
371371
});
372372
return _analyticsOptionsDictionary;
373373
}

0 commit comments

Comments
 (0)