From b8164bec3661fdffb327d9812378823575a4e5fd Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs Date: Fri, 10 Feb 2023 14:35:19 -0500 Subject: [PATCH] refactored members names to mMember to avoid shadowing errors --- .../scenes/ExtensionFieldsSetsImpl.cpp | 36 ++--- .../clusters/scenes/ExtensionFieldsSetsImpl.h | 52 +++---- src/app/clusters/scenes/SceneTable.h | 130 +++++++++--------- src/app/clusters/scenes/SceneTableImpl.cpp | 30 ++-- 4 files changed, 124 insertions(+), 124 deletions(-) diff --git a/src/app/clusters/scenes/ExtensionFieldsSetsImpl.cpp b/src/app/clusters/scenes/ExtensionFieldsSetsImpl.cpp index 28fcdc8a06143d..c7ac0e8b1eacbf 100644 --- a/src/app/clusters/scenes/ExtensionFieldsSetsImpl.cpp +++ b/src/app/clusters/scenes/ExtensionFieldsSetsImpl.cpp @@ -26,14 +26,14 @@ CHIP_ERROR ExtensionFieldsSetsImpl::Serialize(TLV::TLVWriter & writer) const { TLV::TLVType container; ReturnErrorOnFailure(writer.StartContainer(TLV::ContextTag(1), TLV::kTLVType_Structure, container)); - ReturnErrorOnFailure(writer.Put(TagFieldNum(), static_cast(this->fieldNum))); + ReturnErrorOnFailure(writer.Put(TagFieldNum(), static_cast(this->mFieldNum))); if (!this->is_empty()) { for (uint8_t i = 0; i < kMaxClusterPerScenes; i++) { - if (!this->EFS[i].is_empty()) + if (!this->mEFS[i].is_empty()) { - LogErrorOnFailure(this->EFS[i].Serialize(writer)); + LogErrorOnFailure(this->mEFS[i].Serialize(writer)); } } } @@ -48,13 +48,13 @@ CHIP_ERROR ExtensionFieldsSetsImpl::Deserialize(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(container)); ReturnErrorOnFailure(reader.Next(TagFieldNum())); - ReturnErrorOnFailure(reader.Get(this->fieldNum)); + ReturnErrorOnFailure(reader.Get(this->mFieldNum)); if (!this->is_empty()) { - for (uint8_t i = 0; i < this->fieldNum; i++) + for (uint8_t i = 0; i < this->mFieldNum; i++) { - ReturnErrorOnFailure(this->EFS[i].Deserialize(reader)); + ReturnErrorOnFailure(this->mEFS[i].Deserialize(reader)); } } @@ -66,15 +66,15 @@ void ExtensionFieldsSetsImpl::Clear() { for (uint8_t i = 0; i < kMaxClusterPerScenes; i++) { - this->EFS[i].Clear(); + this->mEFS[i].Clear(); } } - this->fieldNum = 0; + this->mFieldNum = 0; } bool ExtensionFieldsSetsImpl::is_empty() const { - return (this->fieldNum <= 0); + return (this->mFieldNum <= 0); } /// @brief Inserts a field set into the array of extension field sets for a scene entry if the same ID is present in the EFS array, @@ -86,13 +86,13 @@ CHIP_ERROR ExtensionFieldsSetsImpl::insertField(ExtensionFieldsSet & field) uint8_t idPosition = 0xff, fisrtEmptyPosition = 0xff; for (uint8_t i = 0; i < kMaxClusterPerScenes; i++) { - if (this->EFS[i].ID == field.ID) + if (this->mEFS[i].mID == field.mID) { idPosition = i; break; } - if (this->EFS[i].is_empty() && fisrtEmptyPosition == 0xFF) + if (this->mEFS[i].is_empty() && fisrtEmptyPosition == 0xFF) { fisrtEmptyPosition = i; } @@ -101,13 +101,13 @@ CHIP_ERROR ExtensionFieldsSetsImpl::insertField(ExtensionFieldsSet & field) // if found, insert at found position, otherwise at first free possition, otherwise return error if (idPosition < kMaxClusterPerScenes) { - ReturnErrorOnFailure(this->EFS[idPosition] = field); + ReturnErrorOnFailure(this->mEFS[idPosition] = field); return CHIP_NO_ERROR; } else if (fisrtEmptyPosition < kMaxClusterPerScenes) { - ReturnErrorOnFailure(this->EFS[fisrtEmptyPosition] = field); - this->fieldNum++; + ReturnErrorOnFailure(this->mEFS[fisrtEmptyPosition] = field); + this->mFieldNum++; return CHIP_NO_ERROR; } else @@ -120,7 +120,7 @@ CHIP_ERROR ExtensionFieldsSetsImpl::getFieldAtPosition(ExtensionFieldsSet & fiel { if (position < kMaxClusterPerScenes) { - ReturnErrorOnFailure(field = this->EFS[position]); + ReturnErrorOnFailure(field = this->mEFS[position]); } return CHIP_NO_ERROR; @@ -132,10 +132,10 @@ CHIP_ERROR ExtensionFieldsSetsImpl::removeFieldAtPosition(uint8_t position) { if (position < kMaxClusterPerScenes) { - if (!this->EFS[position].is_empty()) + if (!this->mEFS[position].is_empty()) { - this->EFS[position].Clear(); - this->fieldNum--; + this->mEFS[position].Clear(); + this->mFieldNum--; } } else diff --git a/src/app/clusters/scenes/ExtensionFieldsSetsImpl.h b/src/app/clusters/scenes/ExtensionFieldsSetsImpl.h index f6a4137dd6f025..5249c735cc8d90 100644 --- a/src/app/clusters/scenes/ExtensionFieldsSetsImpl.h +++ b/src/app/clusters/scenes/ExtensionFieldsSetsImpl.h @@ -29,16 +29,16 @@ struct ExtensionFieldsSet { static constexpr TLV::Tag TagClusterId() { return TLV::ContextTag(1); } static constexpr TLV::Tag TagEFS() { return TLV::ContextTag(2); } - clusterId ID = kInvalidClusterId; - uint8_t bytesBuffer[kMaxFieldsPerCluster] = { 0 }; - uint8_t usedBytes = 0; + clusterId mID = kInvalidClusterId; + uint8_t mBytesBuffer[kMaxFieldsPerCluster] = { 0 }; + uint8_t mUsedBytes = 0; ExtensionFieldsSet() = default; - ExtensionFieldsSet(clusterId cID, uint8_t * data, uint8_t dataSize) : ID(cID), usedBytes(dataSize) + ExtensionFieldsSet(clusterId cmID, uint8_t * data, uint8_t dataSize) : mID(cmID), mUsedBytes(dataSize) { if (dataSize <= kMaxFieldsPerCluster) { - memcpy(bytesBuffer, data, usedBytes); + memcpy(mBytesBuffer, data, mUsedBytes); } } ~ExtensionFieldsSet() = default; @@ -48,8 +48,8 @@ struct ExtensionFieldsSet TLV::TLVType container; ReturnErrorOnFailure(writer.StartContainer(TLV::ContextTag(1), TLV::kTLVType_Structure, container)); - ReturnErrorOnFailure(writer.Put(TagClusterId(), static_cast(this->ID))); - ReturnErrorOnFailure(writer.PutBytes(TagEFS(), bytesBuffer, usedBytes)); + ReturnErrorOnFailure(writer.Put(TagClusterId(), static_cast(this->mID))); + ReturnErrorOnFailure(writer.PutBytes(TagEFS(), mBytesBuffer, mUsedBytes)); return writer.EndContainer(container); } @@ -61,50 +61,50 @@ struct ExtensionFieldsSet ReturnErrorOnFailure(reader.EnterContainer(container)); ReturnErrorOnFailure(reader.Next(TagClusterId())); - ReturnErrorOnFailure(reader.Get(this->ID)); + ReturnErrorOnFailure(reader.Get(this->mID)); ReturnErrorOnFailure(reader.Next(TagEFS())); ReturnErrorOnFailure(reader.Get(buffer)); if (buffer.size() > kMaxFieldsPerCluster) { - this->usedBytes = kMaxFieldsPerCluster; + this->mUsedBytes = kMaxFieldsPerCluster; } else { - this->usedBytes = static_cast(buffer.size()); + this->mUsedBytes = static_cast(buffer.size()); } - memcpy(this->bytesBuffer, buffer.data(), this->usedBytes); + memcpy(this->mBytesBuffer, buffer.data(), this->mUsedBytes); return reader.ExitContainer(container); } void Clear() { - this->ID = kInvalidClusterId; - memset(this->bytesBuffer, 0, kMaxFieldsPerCluster); - this->usedBytes = 0; + this->mID = kInvalidClusterId; + memset(this->mBytesBuffer, 0, kMaxFieldsPerCluster); + this->mUsedBytes = 0; } - bool is_empty() const { return (this->usedBytes == 0); } + bool is_empty() const { return (this->mUsedBytes == 0); } bool operator==(const ExtensionFieldsSet & other) { - return (this->ID == other.ID && !memcmp(this->bytesBuffer, other.bytesBuffer, this->usedBytes) && - this->usedBytes == other.usedBytes); + return (this->mID == other.mID && !memcmp(this->mBytesBuffer, other.mBytesBuffer, this->mUsedBytes) && + this->mUsedBytes == other.mUsedBytes); } CHIP_ERROR operator=(const ExtensionFieldsSet & other) { - if (other.usedBytes <= kMaxFieldsPerCluster) + if (other.mUsedBytes <= kMaxFieldsPerCluster) { - memcpy(this->bytesBuffer, other.bytesBuffer, other.usedBytes); + memcpy(this->mBytesBuffer, other.mBytesBuffer, other.mUsedBytes); } else { return CHIP_ERROR_BUFFER_TOO_SMALL; } - this->ID = other.ID; - this->usedBytes = other.usedBytes; + this->mID = other.mID; + this->mUsedBytes = other.mUsedBytes; return CHIP_NO_ERROR; } @@ -131,7 +131,7 @@ class ExtensionFieldsSetsImpl : public ExtensionFieldsSets { for (uint8_t i = 0; i < kMaxClusterPerScenes; i++) { - if (!(this->EFS[i] == other.EFS[i])) + if (!(this->mEFS[i] == other.mEFS[i])) { return false; } @@ -143,17 +143,17 @@ class ExtensionFieldsSetsImpl : public ExtensionFieldsSets { for (uint8_t i = 0; i < kMaxClusterPerScenes; i++) { - ReturnErrorOnFailure(this->EFS[i] = other.EFS[i]); + ReturnErrorOnFailure(this->mEFS[i] = other.mEFS[i]); } - fieldNum = other.fieldNum; + mFieldNum = other.mFieldNum; return CHIP_NO_ERROR; } protected: static constexpr TLV::Tag TagFieldNum() { return TLV::ContextTag(1); } - ExtensionFieldsSet EFS[kMaxClusterPerScenes]; - uint8_t fieldNum = 0; + ExtensionFieldsSet mEFS[kMaxClusterPerScenes]; + uint8_t mFieldNum = 0; }; } // namespace scenes } // namespace chip diff --git a/src/app/clusters/scenes/SceneTable.h b/src/app/clusters/scenes/SceneTable.h index e2960de8f5d006..431082e75904eb 100644 --- a/src/app/clusters/scenes/SceneTable.h +++ b/src/app/clusters/scenes/SceneTable.h @@ -45,26 +45,26 @@ class SceneTable static constexpr TLV::Tag TagFirstSceneID() { return TLV::ContextTag(3); } // Identifies endpoint to which this scene applies to - EndpointId sceneEndpointId = kInvalidEndpointId; + EndpointId mSceneEndpointId = kInvalidEndpointId; // Identifies group within the scope of the given fabric - SceneGroupID sceneGroupId = kGlobalGroupSceneId; - SceneId sceneId = kUndefinedSceneId; + SceneGroupID mSceneGroupId = kGlobalGroupSceneId; + SceneId mSceneId = kUndefinedSceneId; SceneStorageId() = default; SceneStorageId(EndpointId endpoint, SceneId id, SceneGroupID groupId = kGlobalGroupSceneId) : - sceneEndpointId(endpoint), sceneGroupId(groupId), sceneId(id) + mSceneEndpointId(endpoint), mSceneGroupId(groupId), mSceneId(id) {} SceneStorageId(const SceneStorageId & storageId) : - sceneEndpointId(storageId.sceneEndpointId), sceneGroupId(storageId.sceneGroupId), sceneId(storageId.sceneId) + mSceneEndpointId(storageId.mSceneEndpointId), mSceneGroupId(storageId.mSceneGroupId), mSceneId(storageId.mSceneId) {} CHIP_ERROR Serialize(TLV::TLVWriter & writer) const { TLV::TLVType container; ReturnErrorOnFailure(writer.StartContainer(TLV::ContextTag(1), TLV::kTLVType_Structure, container)); - ReturnErrorOnFailure(writer.Put(TagFirstSceneEndpointID(), static_cast(this->sceneEndpointId))); - ReturnErrorOnFailure(writer.Put(TagFirstSceneGroupID(), static_cast(this->sceneGroupId))); - ReturnErrorOnFailure(writer.Put(TagFirstSceneID(), static_cast(this->sceneId))); + ReturnErrorOnFailure(writer.Put(TagFirstSceneEndpointID(), static_cast(this->mSceneEndpointId))); + ReturnErrorOnFailure(writer.Put(TagFirstSceneGroupID(), static_cast(this->mSceneGroupId))); + ReturnErrorOnFailure(writer.Put(TagFirstSceneID(), static_cast(this->mSceneId))); return writer.EndContainer(container); } @@ -75,31 +75,31 @@ class SceneTable ReturnErrorOnFailure(reader.EnterContainer(container)); ReturnErrorOnFailure(reader.Next(TagFirstSceneEndpointID())); - ReturnErrorOnFailure(reader.Get(this->sceneEndpointId)); + ReturnErrorOnFailure(reader.Get(this->mSceneEndpointId)); ReturnErrorOnFailure(reader.Next(TagFirstSceneGroupID())); - ReturnErrorOnFailure(reader.Get(this->sceneGroupId)); + ReturnErrorOnFailure(reader.Get(this->mSceneGroupId)); ReturnErrorOnFailure(reader.Next(TagFirstSceneID())); - ReturnErrorOnFailure(reader.Get(this->sceneId)); + ReturnErrorOnFailure(reader.Get(this->mSceneId)); return reader.ExitContainer(container); } void Clear() { - sceneEndpointId = kInvalidEndpointId; - sceneGroupId = kGlobalGroupSceneId; - sceneId = kUndefinedSceneId; + mSceneEndpointId = kInvalidEndpointId; + mSceneGroupId = kGlobalGroupSceneId; + mSceneId = kUndefinedSceneId; } bool operator==(const SceneStorageId & other) { - return (this->sceneEndpointId == other.sceneEndpointId && this->sceneGroupId == other.sceneGroupId && - this->sceneId == other.sceneId); + return (this->mSceneEndpointId == other.mSceneEndpointId && this->mSceneGroupId == other.mSceneGroupId && + this->mSceneId == other.mSceneId); } void operator=(const SceneStorageId & other) { - this->sceneEndpointId = other.sceneEndpointId; - this->sceneGroupId = other.sceneGroupId; - this->sceneId = other.sceneId; + this->mSceneEndpointId = other.mSceneEndpointId; + this->mSceneGroupId = other.mSceneGroupId; + this->mSceneId = other.mSceneId; } }; @@ -110,31 +110,31 @@ class SceneTable static constexpr TLV::Tag TagSceneTransitionTime() { return TLV::ContextTag(2); } static constexpr TLV::Tag TagSceneTransitionTime100() { return TLV::ContextTag(3); } - char name[kSceneNameMax] = { 0 }; - size_t nameLength = 0; - SceneTransitionTime sceneTransitionTime = 0; - ExtensionFieldsSetsImpl extentsionFieldsSets; - TransitionTime100ms transitionTime100 = 0; - CharSpan nameSpan; + char mName[kSceneNameMax] = { 0 }; + size_t mNameLength = 0; + SceneTransitionTime mSceneTransitionTime = 0; + ExtensionFieldsSetsImpl mExtentsionFieldsSets; + TransitionTime100ms mTransitionTime100 = 0; + CharSpan mNameSpan; SceneData(const CharSpan & sceneName = CharSpan(), SceneTransitionTime time = 0, TransitionTime100ms time100ms = 0) : - sceneTransitionTime(time), transitionTime100(time100ms) + mSceneTransitionTime(time), mTransitionTime100(time100ms) { this->SetName(sceneName); } SceneData(ExtensionFieldsSetsImpl fields, const CharSpan & sceneName = CharSpan(), SceneTransitionTime time = 0, TransitionTime100ms time100ms = 0) : - sceneTransitionTime(time), - transitionTime100(time100ms) + mSceneTransitionTime(time), + mTransitionTime100(time100ms) { this->SetName(sceneName); - extentsionFieldsSets = fields; + mExtentsionFieldsSets = fields; } SceneData(const SceneData & other) : - sceneTransitionTime(other.sceneTransitionTime), transitionTime100(other.transitionTime100) + mSceneTransitionTime(other.mSceneTransitionTime), mTransitionTime100(other.mTransitionTime100) { - this->SetName(other.nameSpan); - extentsionFieldsSets = other.extentsionFieldsSets; + this->SetName(other.mNameSpan); + mExtentsionFieldsSets = other.mExtentsionFieldsSets; } ~SceneData(){}; @@ -144,14 +144,14 @@ class SceneTable ReturnErrorOnFailure(writer.StartContainer(TLV::ContextTag(1), TLV::kTLVType_Structure, container)); // A 0 size means the name wasn't used so it won't get stored - if (!this->nameSpan.empty()) + if (!this->mNameSpan.empty()) { - ReturnErrorOnFailure(writer.PutString(TagSceneName(), this->nameSpan)); + ReturnErrorOnFailure(writer.PutString(TagSceneName(), this->mNameSpan)); } - ReturnErrorOnFailure(writer.Put(TagSceneTransitionTime(), static_cast(this->sceneTransitionTime))); - ReturnErrorOnFailure(writer.Put(TagSceneTransitionTime100(), static_cast(this->transitionTime100))); - ReturnErrorOnFailure(this->extentsionFieldsSets.Serialize(writer)); + ReturnErrorOnFailure(writer.Put(TagSceneTransitionTime(), static_cast(this->mSceneTransitionTime))); + ReturnErrorOnFailure(writer.Put(TagSceneTransitionTime100(), static_cast(this->mTransitionTime100))); + ReturnErrorOnFailure(this->mExtentsionFieldsSets.Serialize(writer)); return writer.EndContainer(container); } @@ -168,15 +168,15 @@ class SceneTable // If there was no error, a name is expected from the storage, if there was an unexpectec TLV element, if (currTag == TagSceneName()) { - ReturnErrorOnFailure(reader.Get(this->nameSpan)); - this->SetName(this->nameSpan); + ReturnErrorOnFailure(reader.Get(this->mNameSpan)); + this->SetName(this->mNameSpan); ReturnErrorOnFailure(reader.Next(TagSceneTransitionTime())); } - ReturnErrorOnFailure(reader.Get(this->sceneTransitionTime)); + ReturnErrorOnFailure(reader.Get(this->mSceneTransitionTime)); ReturnErrorOnFailure(reader.Next(TagSceneTransitionTime100())); - ReturnErrorOnFailure(reader.Get(this->transitionTime100)); - ReturnErrorOnFailure(this->extentsionFieldsSets.Deserialize(reader)); + ReturnErrorOnFailure(reader.Get(this->mTransitionTime100)); + ReturnErrorOnFailure(this->mExtentsionFieldsSets.Deserialize(reader)); return reader.ExitContainer(container); } @@ -185,38 +185,38 @@ class SceneTable { if (nullptr == sceneName.data()) { - name[0] = 0; - nameLength = 0; + mName[0] = 0; + mNameLength = 0; } else { - Platform::CopyString(name, sceneName); - nameLength = sceneName.size(); + Platform::CopyString(mName, sceneName); + mNameLength = sceneName.size(); } - nameSpan = CharSpan(name, nameLength); + mNameSpan = CharSpan(mName, mNameLength); } void Clear() { this->SetName(CharSpan()); - sceneTransitionTime = 0; - transitionTime100 = 0; - extentsionFieldsSets.Clear(); + mSceneTransitionTime = 0; + mTransitionTime100 = 0; + mExtentsionFieldsSets.Clear(); } bool operator==(const SceneData & other) { - return (this->nameSpan.data_equal(other.nameSpan) && (this->sceneTransitionTime == other.sceneTransitionTime) && - (this->transitionTime100 == other.transitionTime100) && - (this->extentsionFieldsSets == other.extentsionFieldsSets)); + return (this->mNameSpan.data_equal(other.mNameSpan) && (this->mSceneTransitionTime == other.mSceneTransitionTime) && + (this->mTransitionTime100 == other.mTransitionTime100) && + (this->mExtentsionFieldsSets == other.mExtentsionFieldsSets)); } void operator=(const SceneData & other) { - this->SetName(other.nameSpan); - this->extentsionFieldsSets = other.extentsionFieldsSets; - this->sceneTransitionTime = other.sceneTransitionTime; - this->transitionTime100 = other.transitionTime100; + this->SetName(other.mNameSpan); + this->mExtentsionFieldsSets = other.mExtentsionFieldsSets; + this->mSceneTransitionTime = other.mSceneTransitionTime; + this->mTransitionTime100 = other.mTransitionTime100; } }; @@ -225,24 +225,24 @@ class SceneTable { // ID - SceneStorageId storageId; + SceneStorageId mStorageId; // DATA - SceneData storageData; + SceneData mStorageData; SceneTableEntry() = default; - SceneTableEntry(SceneStorageId id) : storageId(id) {} - SceneTableEntry(const SceneStorageId id, const SceneData data) : storageId(id), storageData(data) {} + SceneTableEntry(SceneStorageId id) : mStorageId(id) {} + SceneTableEntry(const SceneStorageId id, const SceneData data) : mStorageId(id), mStorageData(data) {} bool operator==(const SceneTableEntry & other) { - return (this->storageId == other.storageId && this->storageData == other.storageData); + return (this->mStorageId == other.mStorageId && this->mStorageData == other.mStorageData); } void operator=(const SceneTableEntry & other) { - this->storageId = other.storageId; - this->storageData = other.storageData; + this->mStorageId = other.mStorageId; + this->mStorageData = other.mStorageData; } }; @@ -251,7 +251,7 @@ class SceneTable virtual ~SceneTable() = default; // Not copyable - SceneTable(const SceneTable &) = delete; + SceneTable(const SceneTable &) = delete; SceneTable & operator=(const SceneTable &) = delete; virtual CHIP_ERROR Init(PersistentStorageDelegate * storage) = 0; diff --git a/src/app/clusters/scenes/SceneTableImpl.cpp b/src/app/clusters/scenes/SceneTableImpl.cpp index 49e23daf3eb804..ef98d93d48f87a 100644 --- a/src/app/clusters/scenes/SceneTableImpl.cpp +++ b/src/app/clusters/scenes/SceneTableImpl.cpp @@ -58,15 +58,15 @@ struct SceneTableData : public SceneTableEntry, PersistentData idx = index; return CHIP_NO_ERROR; // return scene at current index if scene found } - else if (scene_map[index].sceneEndpointId == kInvalidEndpointId && firstFreeIdx == kUndefinedSceneIndex) + else if (scene_map[index].mSceneEndpointId == kInvalidEndpointId && firstFreeIdx == kUndefinedSceneIndex) { firstFreeIdx = index; } @@ -283,10 +283,10 @@ struct FabricSceneData : public PersistentData CHIP_ERROR SaveScene(PersistentStorageDelegate * storage, const SceneTableEntry & entry) { CHIP_ERROR err; - SceneTableData scene(fabric_index, entry.storageId, entry.storageData); + SceneTableData scene(fabric_index, entry.mStorageId, entry.mStorageData); // Look for empty storage space - err = this->Find(entry.storageId, scene.index); + err = this->Find(entry.mStorageId, scene.index); if (CHIP_NO_ERROR == err) { @@ -296,7 +296,7 @@ struct FabricSceneData : public PersistentData else if (CHIP_ERROR_NOT_FOUND == err) // If not found, scene.index should be the first free index { scene_count++; - scene_map[scene.index] = scene.storageId; + scene_map[scene.index] = scene.mStorageId; ReturnErrorOnFailure(this->Save(storage)); return scene.Save(storage); @@ -361,8 +361,8 @@ CHIP_ERROR DefaultSceneTableImpl::GetSceneTableEntry(FabricIndex fabric_index, S VerifyOrReturnError(fabric.Find(scene_id, scene.index) == CHIP_NO_ERROR, CHIP_ERROR_NOT_FOUND); ReturnErrorOnFailure(scene.Load(mStorage)); - entry.storageId = scene.storageId; - entry.storageData = scene.storageData; + entry.mStorageId = scene.mStorageId; + entry.mStorageData = scene.mStorageData; return CHIP_NO_ERROR; } @@ -490,7 +490,7 @@ CHIP_ERROR DefaultSceneTableImpl::EFSValuesToCluster(ExtensionFieldsSetsImpl & f { for (uint8_t j = 0; j < CHIP_CONFIG_SCENES_MAX_CLUSTERS_PER_SCENES; j++) { - if (EFS.ID == this->handlers[j].getID()) + if (EFS.mID == this->handlers[j].getID()) { ReturnErrorOnFailure(this->handlers[j].setClusterEFS(EFS)); } @@ -550,12 +550,12 @@ bool DefaultSceneTableImpl::SceneEntryIteratorImpl::Next(SceneTableEntry & outpu // looks for next available scene while (mSceneIndex < kMaxScenePerFabric) { - if (fabric.scene_map[mSceneIndex].sceneEndpointId != kInvalidEndpointId) + if (fabric.scene_map[mSceneIndex].mSceneEndpointId != kInvalidEndpointId) { scene.index = mSceneIndex; VerifyOrReturnError(scene.Load(mProvider.mStorage) == CHIP_NO_ERROR, false); - output.storageId = scene.storageId; - output.storageData = scene.storageData; + output.mStorageId = scene.mStorageId; + output.mStorageData = scene.mStorageData; mSceneIndex++; return true;