Static cast added for Wconversion errors

project-chip · Nov 15, 2023 · 1081760 · 1081760
1 parent 39fc33d
commit 1081760
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/app/clusters/scenes/ExtensionFieldsSetsImpl.cpp b/src/app/clusters/scenes/ExtensionFieldsSetsImpl.cpp
@@ -129,12 +129,12 @@ CHIP_ERROR ExtensionFieldsSetsImpl::RemoveFieldAtPosition(uint8_t position)
     VerifyOrReturnError(position < kMaxClusterPerScenes, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnValue(!this->IsEmpty() && !this->mEFS[position].IsEmpty(), CHIP_NO_ERROR);
 
-    uint8_t next    = position + 1;
-    uint8_t moveNum = kMaxClusterPerScenes - next;
+    uint8_t nextPos = position++;
+    uint8_t moveNum = static_cast<uint8_t>(kMaxClusterPerScenes - nextPos);
 
     // TODO: Implement general array management methods
     // Compress array after removal
-    memmove(&this->mEFS[position], &this->mEFS[next], sizeof(ExtensionFieldsSet) * moveNum);
+    memmove(&this->mEFS[position], &this->mEFS[nextPos], sizeof(ExtensionFieldsSet) * moveNum);
 
     this->mFieldNum--;
     // Clear last occupied position

diff --git a/src/app/clusters/scenes/SceneTableImpl.cpp b/src/app/clusters/scenes/SceneTableImpl.cpp
@@ -438,17 +438,17 @@ CHIP_ERROR DefaultSceneTableImpl::RegisterHandler(SceneHandler * handler)
     return err;
 }
 
-CHIP_ERROR DefaultSceneTableImpl::UnregisterHandler(uint8_t pos)
+CHIP_ERROR DefaultSceneTableImpl::UnregisterHandler(uint8_t position)
 {
-    VerifyOrReturnError(pos < kMaxSceneHandlers, CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnValue(!this->HandlerListEmpty() && !(this->mHandlers[pos] == nullptr), CHIP_NO_ERROR);
+    VerifyOrReturnError(position < kMaxSceneHandlers, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnValue(!this->HandlerListEmpty() && !(this->mHandlers[position] == nullptr), CHIP_NO_ERROR);
 
-    uint8_t nextPos = pos++;
-    uint8_t moveNum = kMaxSceneHandlers - nextPos;
+    uint8_t nextPos = position++;
+    uint8_t moveNum = static_cast<uint8_t>(kMaxSceneHandlers - nextPos);
 
     // TODO: Implement general array management methods
     // Compress array after removal
-    memmove(&this->mHandlers[pos], &this->mHandlers[nextPos], sizeof(SceneHandler *) * moveNum);
+    memmove(&this->mHandlers[position], &this->mHandlers[nextPos], sizeof(SceneHandler *) * moveNum);
 
     this->handlerNum--;
     // Clear last occupied position