From 12faf205f34042aa7fb6ff13c6980556dbb1ba39 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Mon, 12 Feb 2018 19:11:45 -0800
Subject: Cleaning up implicit retain for the RTDB and Storage

---
 Firebase/Storage/FIRStorageDeleteTask.m         | 2 +-
 Firebase/Storage/FIRStorageDownloadTask.m       | 6 +++---
 Firebase/Storage/FIRStorageGetMetadataTask.m    | 4 ++--
 Firebase/Storage/FIRStorageMetadata.m           | 4 ++--
 Firebase/Storage/FIRStorageUpdateMetadataTask.m | 4 ++--
 Firebase/Storage/FIRStorageUploadTask.m         | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'Firebase/Storage')

diff --git a/Firebase/Storage/FIRStorageDeleteTask.m b/Firebase/Storage/FIRStorageDeleteTask.m
index 738d8a5..b41f06e 100644
--- a/Firebase/Storage/FIRStorageDeleteTask.m
+++ b/Firebase/Storage/FIRStorageDeleteTask.m
@@ -60,7 +60,7 @@
     if (callback) {
       callback(self.error);
     }
-    _fetcherCompletion = nil;
+    self->_fetcherCompletion = nil;
   };
 #pragma clang diangostic pop
 
diff --git a/Firebase/Storage/FIRStorageDownloadTask.m b/Firebase/Storage/FIRStorageDownloadTask.m
index c410f05..91da4b7 100644
--- a/Firebase/Storage/FIRStorageDownloadTask.m
+++ b/Firebase/Storage/FIRStorageDownloadTask.m
@@ -116,7 +116,7 @@
       self.error = [FIRStorageErrors errorWithServerError:error reference:self.reference];
       [self fireHandlersForStatus:FIRStorageTaskStatusFailure snapshot:self.snapshot];
       [self removeAllObservers];
-      _fetcherCompletion = nil;
+      self->_fetcherCompletion = nil;
       return;
     }
 
@@ -124,12 +124,12 @@
     self.state = FIRStorageTaskStateSuccess;
 
     if (data) {
-      _downloadData = data;
+      self->_downloadData = data;
     }
 
     [self fireHandlersForStatus:FIRStorageTaskStatusSuccess snapshot:self.snapshot];
     [self removeAllObservers];
-    _fetcherCompletion = nil;
+    self->_fetcherCompletion = nil;
   };
 #pragma clang diagnostic pop
 
diff --git a/Firebase/Storage/FIRStorageGetMetadataTask.m b/Firebase/Storage/FIRStorageGetMetadataTask.m
index 78d8a16..2623652 100644
--- a/Firebase/Storage/FIRStorageGetMetadataTask.m
+++ b/Firebase/Storage/FIRStorageGetMetadataTask.m
@@ -65,7 +65,7 @@
       if (callback) {
         callback(nil, self.error);
       }
-      _fetcherCompletion = nil;
+      self->_fetcherCompletion = nil;
       return;
     }
 
@@ -90,7 +90,7 @@
         callback(nil, self.error);
       }
     }
-    _fetcherCompletion = nil;
+    self->_fetcherCompletion = nil;
   };
 #pragma clang diagnostic pop
 
diff --git a/Firebase/Storage/FIRStorageMetadata.m b/Firebase/Storage/FIRStorageMetadata.m
index 34ac86c..5c12595 100644
--- a/Firebase/Storage/FIRStorageMetadata.m
+++ b/Firebase/Storage/FIRStorageMetadata.m
@@ -60,8 +60,8 @@
         NSURLComponents *components = [[NSURLComponents alloc] init];
         components.scheme = kFIRStorageScheme;
         components.host = kFIRStorageHost;
-        NSString *path = [FIRStorageUtils GCSEscapedString:_path];
-        NSString *fullPath = [NSString stringWithFormat:kFIRStorageFullPathFormat, _bucket, path];
+        NSString *path = [FIRStorageUtils GCSEscapedString:self->_path];
+        NSString *fullPath = [NSString stringWithFormat:kFIRStorageFullPathFormat, self->_bucket, path];
         components.percentEncodedPath = fullPath;
         components.query = [NSString stringWithFormat:@"alt=media&token=%@", token];
 
diff --git a/Firebase/Storage/FIRStorageUpdateMetadataTask.m b/Firebase/Storage/FIRStorageUpdateMetadataTask.m
index cf1bf93..fa5955a 100644
--- a/Firebase/Storage/FIRStorageUpdateMetadataTask.m
+++ b/Firebase/Storage/FIRStorageUpdateMetadataTask.m
@@ -71,7 +71,7 @@
       if (callback) {
         callback(nil, self.error);
       }
-      _fetcherCompletion = nil;
+      self->_fetcherCompletion = nil;
       return;
     }
 
@@ -96,7 +96,7 @@
         callback(nil, self.error);
       }
     }
-    _fetcherCompletion = nil;
+    self->_fetcherCompletion = nil;
   };
 #pragma clang diagnostic pop
 
diff --git a/Firebase/Storage/FIRStorageUploadTask.m b/Firebase/Storage/FIRStorageUploadTask.m
index 0df0bf4..f84c2c7 100644
--- a/Firebase/Storage/FIRStorageUploadTask.m
+++ b/Firebase/Storage/FIRStorageUploadTask.m
@@ -117,7 +117,7 @@
     weakSelf.state = FIRStorageTaskStateProgress;
     weakSelf.progress.completedUnitCount = totalBytesSent;
     weakSelf.progress.totalUnitCount = totalBytesExpectedToSend;
-    weakSelf.metadata = _uploadMetadata;
+    weakSelf.metadata = self->_uploadMetadata;
     [weakSelf fireHandlersForStatus:FIRStorageTaskStatusProgress snapshot:weakSelf.snapshot];
     weakSelf.state = FIRStorageTaskStateRunning;
   }];
@@ -137,10 +137,10 @@
     if (error) {
       self.state = FIRStorageTaskStateFailed;
       self.error = [FIRStorageErrors errorWithServerError:error reference:self.reference];
-      self.metadata = _uploadMetadata;
+      self.metadata = self->_uploadMetadata;
       [self fireHandlersForStatus:FIRStorageTaskStatusFailure snapshot:self.snapshot];
       [self removeAllObservers];
-      _fetcherCompletion = nil;
+      self->_fetcherCompletion = nil;
       return;
     }
 
@@ -166,7 +166,7 @@
 
     [self fireHandlersForStatus:FIRStorageTaskStatusSuccess snapshot:self.snapshot];
     [self removeAllObservers];
-    _fetcherCompletion = nil;
+    self->_fetcherCompletion = nil;
   };
 #pragma clang diagnostic pop
 
-- 
cgit v1.2.3