Skip to content

Commit 1741907

Browse files
committed
fix uninitialized variable in block capture
1 parent ac33885 commit 1741907

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

FirebaseDatabaseUI/FirebaseIndexArray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ didFailLoadWithError:(NSError *)error;
7171
- (void)array:(FirebaseIndexArray *)array didAddReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
7272

7373
/**
74-
* Delegate method which is called whenever an object is chinged in a
74+
* Delegate method which is called whenever an object is changed in a
7575
* FirebaseArray. On a
7676
* FirebaseArray synchronized to a Firebase reference, this corresponds to an
7777
* [FIRDataEventTypeChildChanged](https://www.firebase.com/docs/ios/guide/retrieving-data.html#section-event-types)

FirebaseDatabaseUI/FirebaseIndexArray.m

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ - (void)array:(FirebaseArray *)array
131131
NSParameterAssert([object.key isKindOfClass:[NSString class]]);
132132
id<FIRDataObservable> query = [self.data child:object.key];
133133
FirebaseQueryObserver *obs = [FirebaseQueryObserver observerForQuery:query
134-
completion:^(FIRDataSnapshot *snap,
134+
completion:^(FirebaseQueryObserver *observer,
135+
FIRDataSnapshot *snap,
135136
NSError *error) {
136-
[self observer:obs didFinishLoadWithSnap:snap error:error];
137+
[self observer:observer didFinishLoadWithSnap:snap error:error];
137138
}];
138139
[self.observers insertObject:obs atIndex:index];
139140

@@ -168,9 +169,10 @@ - (void)array:(FirebaseArray *)array
168169
// Add new observer
169170
id<FIRDataObservable> query = [self.data child:object.key];
170171
FirebaseQueryObserver *obs = [FirebaseQueryObserver observerForQuery:query
171-
completion:^(FIRDataSnapshot *snap,
172+
completion:^(FirebaseQueryObserver *observer,
173+
FIRDataSnapshot *snap,
172174
NSError *error) {
173-
[self observer:obs didFinishLoadWithSnap:snap error:error];
175+
[self observer:observer didFinishLoadWithSnap:snap error:error];
174176
}];
175177
[self.observers replaceObjectAtIndex:index withObject:obs];
176178

FirebaseDatabaseUI/FirebaseQueryObserver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
3838
* Creates a query observer and immediately starts observing the query.
3939
*/
4040
+ (FirebaseQueryObserver *)observerForQuery:(id<FIRDataObservable>)query
41-
completion:(void (^_Nullable)(FIRDataSnapshot *_Nullable,
41+
completion:(void (^_Nullable)(FirebaseQueryObserver *obs,
42+
FIRDataSnapshot *_Nullable,
4243
NSError *_Nullable))completion;
4344

4445
/**

FirebaseDatabaseUI/FirebaseQueryObserver.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,18 @@ - (instancetype)initWithQuery:(id<FIRDataObservable>)query {
4444
}
4545

4646
+ (FirebaseQueryObserver *)observerForQuery:(id<FIRDataObservable>)query
47-
completion:(void (^)(FIRDataSnapshot *snap, NSError *error))completion {
47+
completion:(void (^)(FirebaseQueryObserver *obs,
48+
FIRDataSnapshot *snap,
49+
NSError *error))completion {
4850
FirebaseQueryObserver *obs = [[FirebaseQueryObserver alloc] initWithQuery:query];
4951

5052
void (^observerBlock)(FIRDataSnapshot *, NSString *) = ^(FIRDataSnapshot *snap,
5153
NSString *previous) {
5254
obs.contents = snap;
53-
completion(snap, nil);
55+
completion(obs, snap, nil);
5456
};
5557
void (^cancelBlock)(NSError *) = ^(NSError *error) {
56-
completion(nil, error);
58+
completion(obs, nil, error);
5759
};
5860

5961
[obs observeEventType:FIRDataEventTypeChildAdded

0 commit comments

Comments
 (0)