@@ -2279,29 +2279,24 @@ - (void)_removeCachedAttribute:(NSNumber *)attributeID fromCluster:(MTRClusterPa
2279
2279
2280
2280
- (void)_createDataVersionFilterListFromDictionary:(NSDictionary<MTRClusterPath *, NSNumber *> *)dataVersions dataVersionFilterList:(DataVersionFilter **)dataVersionFilterList count:(size_t *)count
2281
2281
{
2282
- size_t maxDataVersionFilterSize = dataVersions.count;
2282
+ size_t dataVersionFilterSize = dataVersions.count;
2283
2283
2284
2284
// Check if any filter list should be generated
2285
- if (!dataVersions.count ) {
2285
+ if (dataVersionFilterSize == 0 ) {
2286
2286
*count = 0;
2287
2287
*dataVersionFilterList = nullptr;
2288
2288
return;
2289
2289
}
2290
2290
2291
- DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[maxDataVersionFilterSize ];
2291
+ DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[dataVersionFilterSize ];
2292
2292
size_t i = 0;
2293
2293
for (MTRClusterPath * path in dataVersions) {
2294
2294
NSNumber * dataVersionNumber = dataVersions[path];
2295
- if (dataVersionNumber) {
2296
- dataVersionFilterArray[i++] = DataVersionFilter(static_cast<chip::EndpointId>(path.endpoint.unsignedShortValue), static_cast<chip::ClusterId>(path.cluster.unsignedLongValue), static_cast<chip::DataVersion>(dataVersionNumber.unsignedLongValue));
2297
- }
2295
+ dataVersionFilterArray[i++] = DataVersionFilter(static_cast<chip::EndpointId>(path.endpoint.unsignedShortValue), static_cast<chip::ClusterId>(path.cluster.unsignedLongValue), static_cast<chip::DataVersion>(dataVersionNumber.unsignedLongValue));
2298
2296
}
2299
2297
2300
2298
*dataVersionFilterList = dataVersionFilterArray;
2301
- // Note that we might have i < maxDataVersionFilterSize here if some of the
2302
- // dictionary entries had a null dataVersionNumber. The correct size of the
2303
- // valid entried in our array is "i".
2304
- *count = i;
2299
+ *count = dataVersionFilterSize;
2305
2300
}
2306
2301
2307
2302
- (void)_setupConnectivityMonitoring
0 commit comments