Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove no-longer-used MTRDevice logic for truncating data version lists #34183

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+60 −79
Open

Remove no-longer-used MTRDevice logic for truncating data version lists #34183

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
493c5f8
Remove no-longer-used MTRDevice logic for truncating data version lists
bzbarsky-apple Jul 3, 2024
60eebd5
Address review comment.
bzbarsky-apple Jul 3, 2024
af99177
Fix compile issues.
bzbarsky-apple Jul 3, 2024
aa4097a
Address another review comment.
bzbarsky-apple Jul 3, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Address another review comment.
  • Loading branch information
@bzbarsky-apple
bzbarsky-apple committed Jul 3, 2024
commit aa4097a55f52ac8351878927ff932cf935882116
15 changes: 5 additions & 10 deletions src/darwin/Framework/CHIP/MTRDevice.mm
View file
Open in desktop
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
Loading