Skip to content

Commit

Permalink
Address another review comment.
Browse files Browse the repository at this point in the history
  • Loading branch information
bzbarsky-apple committed Jul 3, 2024
1 parent af99177 commit aa4097a
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions src/darwin/Framework/CHIP/MTRDevice.mm
Original file line number Diff line number Diff line change
Expand Up @@ -2225,29 +2225,24 @@ - (void)_removeCachedAttribute:(NSNumber *)attributeID fromCluster:(MTRClusterPa

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

// Check if any filter list should be generated
if (!dataVersions.count) {
if (dataVersionFilterSize == 0) {
*count = 0;
*dataVersionFilterList = nullptr;
return;
}

DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[maxDataVersionFilterSize];
DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[dataVersionFilterSize];
size_t i = 0;
for (MTRClusterPath * path in dataVersions) {
NSNumber * dataVersionNumber = dataVersions[path];
if (dataVersionNumber) {
dataVersionFilterArray[i++] = DataVersionFilter(static_cast<chip::EndpointId>(path.endpoint.unsignedShortValue), static_cast<chip::ClusterId>(path.cluster.unsignedLongValue), static_cast<chip::DataVersion>(dataVersionNumber.unsignedLongValue));
}
dataVersionFilterArray[i++] = DataVersionFilter(static_cast<chip::EndpointId>(path.endpoint.unsignedShortValue), static_cast<chip::ClusterId>(path.cluster.unsignedLongValue), static_cast<chip::DataVersion>(dataVersionNumber.unsignedLongValue));
}

*dataVersionFilterList = dataVersionFilterArray;
// Note that we might have i < maxDataVersionFilterSize here if some of the
// dictionary entries had a null dataVersionNumber. The correct size of the
// valid entried in our array is "i".
*count = i;
*count = dataVersionFilterSize;
}

- (void)_setupConnectivityMonitoring
Expand Down

0 comments on commit aa4097a

Please sign in to comment.