@@ -2225,29 +2225,24 @@ - (void)_removeCachedAttribute:(NSNumber *)attributeID fromCluster:(MTRClusterPa
2225
2225
2226
2226
- (void )_createDataVersionFilterListFromDictionary : (NSDictionary <MTRClusterPath *, NSNumber *> *)dataVersions dataVersionFilterList : (DataVersionFilter **)dataVersionFilterList count : (size_t *)count
2227
2227
{
2228
- size_t maxDataVersionFilterSize = dataVersions.count ;
2228
+ size_t dataVersionFilterSize = dataVersions.count ;
2229
2229
2230
2230
// Check if any filter list should be generated
2231
- if (!dataVersions. count ) {
2231
+ if (dataVersionFilterSize == 0 ) {
2232
2232
*count = 0 ;
2233
2233
*dataVersionFilterList = nullptr ;
2234
2234
return ;
2235
2235
}
2236
2236
2237
- DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[maxDataVersionFilterSize ];
2237
+ DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[dataVersionFilterSize ];
2238
2238
size_t i = 0 ;
2239
2239
for (MTRClusterPath * path in dataVersions) {
2240
2240
NSNumber * dataVersionNumber = dataVersions[path];
2241
- if (dataVersionNumber) {
2242
- dataVersionFilterArray[i++] = DataVersionFilter (static_cast <chip::EndpointId>(path.endpoint .unsignedShortValue ), static_cast <chip::ClusterId>(path.cluster .unsignedLongValue ), static_cast <chip::DataVersion>(dataVersionNumber.unsignedLongValue ));
2243
- }
2241
+ dataVersionFilterArray[i++] = DataVersionFilter (static_cast <chip::EndpointId>(path.endpoint .unsignedShortValue ), static_cast <chip::ClusterId>(path.cluster .unsignedLongValue ), static_cast <chip::DataVersion>(dataVersionNumber.unsignedLongValue ));
2244
2242
}
2245
2243
2246
2244
*dataVersionFilterList = dataVersionFilterArray;
2247
- // Note that we might have i < maxDataVersionFilterSize here if some of the
2248
- // dictionary entries had a null dataVersionNumber. The correct size of the
2249
- // valid entried in our array is "i".
2250
- *count = i;
2245
+ *count = dataVersionFilterSize;
2251
2246
}
2252
2247
2253
2248
- (void )_setupConnectivityMonitoring
0 commit comments