Skip to content

Commit aa4097a

Browse files
Address another review comment.
1 parent af99177 commit aa4097a

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
@@ -2225,29 +2225,24 @@ - (void)_removeCachedAttribute:(NSNumber *)attributeID fromCluster:(MTRClusterPa
22252225

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

22302230
// Check if any filter list should be generated
2231-
if (!dataVersions.count) {
2231+
if (dataVersionFilterSize == 0) {
22322232
*count = 0;
22332233
*dataVersionFilterList = nullptr;
22342234
return;
22352235
}
22362236

2237-
DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[maxDataVersionFilterSize];
2237+
DataVersionFilter * dataVersionFilterArray = new DataVersionFilter[dataVersionFilterSize];
22382238
size_t i = 0;
22392239
for (MTRClusterPath * path in dataVersions) {
22402240
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));
22442242
}
22452243

22462244
*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;
22512246
}
22522247

22532248
- (void)_setupConnectivityMonitoring

0 commit comments

Comments
 (0)