Skip to content

Commit f23754e

Browse files
committedJul 23, 2024
Address another review comment.
1 parent 3b7d7cf commit f23754e

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed
 

‎src/darwin/Framework/CHIP/MTRDevice.mm

+5-10
Original file line numberDiff line numberDiff line change
@@ -2279,29 +2279,24 @@ - (void)_removeCachedAttribute:(NSNumber *)attributeID fromCluster:(MTRClusterPa
22792279

22802280
- (void)_createDataVersionFilterListFromDictionary:(NSDictionary<MTRClusterPath *, NSNumber *> *)dataVersions dataVersionFilterList:(DataVersionFilter **)dataVersionFilterList count:(size_t *)count
22812281
{
2282-
size_t maxDataVersionFilterSize = dataVersions.count;
2282+
size_t dataVersionFilterSize = dataVersions.count;
22832283

22842284
// Check if any filter list should be generated
2285-
if (!dataVersions.count) {
2285+
if (dataVersionFilterSize == 0) {
22862286
*count = 0;
22872287
*dataVersionFilterList = nullptr;
22882288
return;
22892289
}
22902290

2291-
DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[maxDataVersionFilterSize];
2291+
DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[dataVersionFilterSize];
22922292
size_t i = 0;
22932293
for (MTRClusterPath * path in dataVersions) {
22942294
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));
22982296
}
22992297

23002298
*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;
23052300
}
23062301

23072302
- (void)_setupConnectivityMonitoring

0 commit comments

Comments
 (0)