Clang-tidy readability-else-after-return (project-chip#16312)

* use clang-tidy to readability-else-after-return

* Restyle

* Ran a 2nd pass

* Restyle

* Ran a 2nd pass

* Restyle

src/access/examples/ExampleAccessControlDelegate.cpp

@@ -870,7 +870,7 @@ class EntryDelegate : public Entry::Delegate
         {
             return CHIP_NO_ERROR;
         }
-        else if (auto * storage = EntryStorage::Find(nullptr))
+        if (auto * storage = EntryStorage::Find(nullptr))
         {
             *storage = *mStorage;
             mStorage = storage;

src/app/AttributePathExpandIterator.cpp

@@ -205,7 +205,7 @@ bool AttributePathExpandIterator::Next()
                     // Return true will skip the increment of mClusterIndex, mEndpointIndex and mpClusterInfo.
                     return true;
                 }
-                else if (mGlobalAttributeIndex < mGlobalAttributeEndIndex)
+                if (mGlobalAttributeIndex < mGlobalAttributeEndIndex)
                 {
                     // Return a path pointing to the next global attribute.
                     mOutputPath.mAttributeId = GlobalAttributesNotInMetadata[mGlobalAttributeIndex];

src/app/ChunkedWriteCallback.cpp

@@ -38,11 +38,9 @@ void ChunkedWriteCallback::OnResponse(const WriteClient * apWriteClient, const C
             }
             return;
         }
-        else
-        {
-            // This is a response to another attribute write. Report the final result of last attribute write.
-            callback->OnResponse(apWriteClient, mLastAttributePath.Value(), mAttributeStatus);
-        }
+
+        // This is a response to another attribute write. Report the final result of last attribute write.
+        callback->OnResponse(apWriteClient, mLastAttributePath.Value(), mAttributeStatus);
     }
 
     // This is the first report for a new attribute.  We assume it will never be a list item operation.

src/app/CommandHandler.cpp

@@ -546,10 +546,8 @@ TLV::TLVWriter * CommandHandler::GetCommandDataIBTLVWriter()
     {
         return nullptr;
     }
-    else
-    {
-        return mInvokeResponseBuilder.GetInvokeResponses().GetInvokeResponse().GetCommand().GetWriter();
-    }
+
+    return mInvokeResponseBuilder.GetInvokeResponses().GetInvokeResponse().GetCommand().GetWriter();
 }
 
 FabricIndex CommandHandler::GetAccessingFabricIndex() const

src/app/CommandSender.cpp

@@ -372,10 +372,8 @@ TLV::TLVWriter * CommandSender::GetCommandDataIBTLVWriter()
     {
         return nullptr;
     }
-    else
-    {
-        return mInvokeRequestBuilder.GetInvokeRequests().GetCommandData().GetWriter();
-    }
+
+    return mInvokeRequestBuilder.GetInvokeRequests().GetCommandData().GetWriter();
 }
 
 CHIP_ERROR CommandSender::HandleTimedStatus(const PayloadHeader & aPayloadHeader, System::PacketBufferHandle && aPayload)

src/app/EventManagement.cpp

@@ -399,7 +399,7 @@ CHIP_ERROR EventManagement::CopyAndAdjustDeltaTime(const TLVReader & aReader, si
         // Does not go on the wire.
         return CHIP_NO_ERROR;
     }
-    else if ((aReader.GetTag() == TLV::ContextTag(to_underlying(EventDataIB::Tag::kSystemTimestamp))) && !(ctx->mpContext->mFirst))
+    if ((aReader.GetTag() == TLV::ContextTag(to_underlying(EventDataIB::Tag::kSystemTimestamp))) && !(ctx->mpContext->mFirst))
     {
         return ctx->mpWriter->Put(TLV::ContextTag(to_underlying(EventDataIB::Tag::kDeltaSystemTimestamp)),
                                   ctx->mpContext->mCurrentTime.mValue - ctx->mpContext->mPreviousTime.mValue);
@@ -501,12 +501,10 @@ CHIP_ERROR EventManagement::LogEventPrivate(EventLoggingDelegate * apDelegate, c
         {
             break;
         }
-        else
-        {
-            buffer = buffer->GetNextCircularEventBuffer();
-            assert(buffer != nullptr);
-            // code guarantees that every PriorityLevel has a buffer destination.
-        }
+
+        buffer = buffer->GetNextCircularEventBuffer();
+        assert(buffer != nullptr);
+        // code guarantees that every PriorityLevel has a buffer destination.
     }
 
     mBytesWritten += writer.GetLengthWritten();

src/app/ReadClient.cpp

@@ -904,12 +904,11 @@ bool ReadClient::ResubscribeIfNeeded()
         ChipLogProgress(DataManagement, "Fail to resubscribe with error %" CHIP_ERROR_FORMAT, err.Format());
         return false;
     }
-    else
-    {
-        ChipLogProgress(DataManagement,
-                        "Will try to Resubscribe to %02x:" ChipLogFormatX64 " at retry index %" PRIu32 " after %" PRIu32 "ms",
-                        mFabricIndex, ChipLogValueX64(mPeerNodeId), mNumRetries, intervalMsec);
-    }
+
+    ChipLogProgress(DataManagement,
+                    "Will try to Resubscribe to %02x:" ChipLogFormatX64 " at retry index %" PRIu32 " after %" PRIu32 "ms",
+                    mFabricIndex, ChipLogValueX64(mPeerNodeId), mNumRetries, intervalMsec);
+
     return true;
 }
 

src/app/WriteClient.cpp

@@ -322,10 +322,8 @@ CHIP_ERROR WriteClient::PutPreencodedAttribute(const ConcreteDataAttributePath &
         }
         return err;
     }
-    else // We are writing a non-list attribute, or we are writing a single element of a list.
-    {
-        return PutSinglePreencodedAttributeWritePayload(attributePath, data);
-    }
+    // We are writing a non-list attribute, or we are writing a single element of a list.
+    return PutSinglePreencodedAttributeWritePayload(attributePath, data);
 }
 
 const char * WriteClient::GetStateStr() const

src/app/WriteClient.h

@@ -196,10 +196,8 @@ class WriteClient : public Messaging::ExchangeDelegate
                                           attributePath.mClusterId, attributePath.mAttributeId, aDataVersion),
                 value);
         }
-        else
-        {
-            return EncodeAttribute(attributePath, value.Value());
-        }
+
+        return EncodeAttribute(attributePath, value.Value());
     }
 
     /**

src/app/data-model/DecodableList.h

@@ -134,10 +134,8 @@ class DecodableList
             {
                 return CHIP_NO_ERROR;
             }
-            else
-            {
-                return mStatus;
-            }
+
+            return mStatus;
         }
 
     private:
@@ -194,10 +192,8 @@ class DecodableList
             *size = 0;
             return CHIP_NO_ERROR;
         }
-        else
-        {
-            return mReader.CountRemainingInContainer(size);
-        }
+
+        return mReader.CountRemainingInContainer(size);
     }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader)

src/app/reporting/Engine.cpp

@@ -763,10 +763,9 @@ CHIP_ERROR Engine::ScheduleEventDelivery(ConcreteEventPath & aPath, uint32_t aBy
         ChipLogDetail(DataManagement, "urgent event schedule run");
         return ScheduleRun();
     }
-    else
-    {
-        return ScheduleBufferPressureEventDelivery(aBytesWritten);
-    }
+
+    return ScheduleBufferPressureEventDelivery(aBytesWritten);
+
     return CHIP_NO_ERROR;
 }
 

src/app/server/Server.h

@@ -122,11 +122,9 @@ class Server
                 {
                     return CHIP_ERROR_INVALID_ARGUMENT;
                 }
-                else
-                {
-                    // When size is zero, let's give a non-nullptr to the KVS backend
-                    buffer = &emptyPlaceholder;
-                }
+
+                // When size is zero, let's give a non-nullptr to the KVS backend
+                buffer = &emptyPlaceholder;
             }
 
             size_t bytesRead = 0;

src/app/tests/suites/pics/PICSBooleanExpressionParser.cpp

@@ -115,17 +115,15 @@ bool PICSBooleanExpressionParser::EvaluateExpression(std::vector<std::string> &
         bool rightExpr = EvaluateExpression(tokens, PICS, index);
         return leftExpr && rightExpr;
     }
-    else if (token == "||")
+    if (token == "||")
     {
         index++;
         bool rightExpr = EvaluateExpression(tokens, PICS, index);
         return leftExpr || rightExpr;
     }
-    else
-    {
-        ChipLogError(chipTool, "Unknown token: '%s'", token.c_str());
-        chipDie();
-    }
+
+    ChipLogError(chipTool, "Unknown token: '%s'", token.c_str());
+    chipDie();
 }
 
 bool PICSBooleanExpressionParser::EvaluateSubExpression(std::vector<std::string> & tokens, std::map<std::string, bool> & PICS,
@@ -145,23 +143,21 @@ bool PICSBooleanExpressionParser::EvaluateSubExpression(std::vector<std::string>
         index++;
         return expr;
     }
-    else if (token == "!")
+    if (token == "!")
     {
         index++;
         bool expr = EvaluateSubExpression(tokens, PICS, index);
         return !expr;
     }
-    else
-    {
-        index++;
 
-        if (PICS.find(token) == PICS.end())
-        {
-            // By default, let's consider that if a PICS item is not defined, it is |false|.
-            // It allows to create a file that only contains enabled features.
-            return false;
-        }
+    index++;
 
-        return PICS[token];
+    if (PICS.find(token) == PICS.end())
+    {
+        // By default, let's consider that if a PICS item is not defined, it is |false|.
+        // It allows to create a file that only contains enabled features.
+        return false;
     }
+
+    return PICS[token];
 }

src/app/util/af-event.cpp

@@ -195,10 +195,8 @@ EmberStatus emberAfEventControlSetDelayQS(EmberEventControl * control, uint32_t
     {
         return emberEventControlSetDelayMS(control, delayQs << 8);
     }
-    else
-    {
-        return EMBER_BAD_ARGUMENT;
-    }
+
+    return EMBER_BAD_ARGUMENT;
 }
 
 EmberStatus emberAfEventControlSetDelayMinutes(EmberEventControl * control, uint16_t delayM)
@@ -207,10 +205,8 @@ EmberStatus emberAfEventControlSetDelayMinutes(EmberEventControl * control, uint
     {
         return emberEventControlSetDelayMS(control, static_cast<uint32_t>(delayM) << 16);
     }
-    else
-    {
-        return EMBER_BAD_ARGUMENT;
-    }
+
+    return EMBER_BAD_ARGUMENT;
 }
 
 EmberStatus emberAfScheduleTickExtended(EndpointId endpoint, ClusterId clusterId, bool isClient, uint32_t delayMs,

src/app/util/attribute-storage.cpp

@@ -370,19 +370,17 @@ EmberAfStatus emAfClusterPreAttributeChangedCallback(const app::ConcreteAttribut
     {
         return EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE;
     }
-    else
+
+    EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
+    // Casting and calling a function pointer on the same line results in ignoring the return
+    // of the call on gcc-arm-none-eabi-9-2019-q4-major
+    EmberAfClusterPreAttributeChangedCallback f = (EmberAfClusterPreAttributeChangedCallback)(
+        emberAfFindClusterFunction(cluster, CLUSTER_MASK_PRE_ATTRIBUTE_CHANGED_FUNCTION));
+    if (f != NULL)
     {
-        EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
-        // Casting and calling a function pointer on the same line results in ignoring the return
-        // of the call on gcc-arm-none-eabi-9-2019-q4-major
-        EmberAfClusterPreAttributeChangedCallback f = (EmberAfClusterPreAttributeChangedCallback)(
-            emberAfFindClusterFunction(cluster, CLUSTER_MASK_PRE_ATTRIBUTE_CHANGED_FUNCTION));
-        if (f != NULL)
-        {
-            status = f(attributePath, attributeType, size, value);
-        }
-        return status;
+        status = f(attributePath, attributeType, size, value);
     }
+    return status;
 }
 
 static void initializeEndpoint(EmberAfDefinedEndpoint * definedEndpoint)
@@ -623,17 +621,15 @@ EmberAfStatus emAfReadOrWriteAttribute(EmberAfAttributeSearchRecord * attRecord,
                                                   : emberAfExternalAttributeReadCallback(attRecord->endpoint, attRecord->clusterId,
                                                                                          am, buffer, emberAfAttributeSize(am)));
                                 }
+
+                                // Internal storage is only supported for fixed endpoints
+                                if (!isDynamicEndpoint)
+                                {
+                                    return typeSensitiveMemCopy(attRecord->clusterId, dst, src, am, write, readLength);
+                                }
                                 else
                                 {
-                                    // Internal storage is only supported for fixed endpoints
-                                    if (!isDynamicEndpoint)
-                                    {
-                                        return typeSensitiveMemCopy(attRecord->clusterId, dst, src, am, write, readLength);
-                                    }
-                                    else
-                                    {
-                                        return EMBER_ZCL_STATUS_FAILURE;
-                                    }
+                                    return EMBER_ZCL_STATUS_FAILURE;
                                 }
                             }
                         }
@@ -750,10 +746,8 @@ bool emberAfContainsServerFromIndex(uint16_t index, ClusterId clusterId)
     {
         return false;
     }
-    else
-    {
-        return emberAfFindClusterInType(emAfEndpoints[index].endpointType, clusterId, CLUSTER_MASK_SERVER);
-    }
+
+    return emberAfFindClusterInType(emAfEndpoints[index].endpointType, clusterId, CLUSTER_MASK_SERVER);
 }
 
 namespace chip {
@@ -797,10 +791,8 @@ const EmberAfCluster * emberAfFindCluster(EndpointId endpoint, ClusterId cluster
     {
         return NULL;
     }
-    else
-    {
-        return emberAfFindClusterInType(emAfEndpoints[ep].endpointType, clusterId, mask);
-    }
+
+    return emberAfFindClusterInType(emAfEndpoints[ep].endpointType, clusterId, mask);
 }
 
 // Returns cluster within the endpoint; Does not ignore disabled endpoints

src/app/util/binding-table.cpp

@@ -64,23 +64,21 @@ CHIP_ERROR BindingTable::Add(const EmberBindingTableEntry & entry)
         mBindingTable[newIndex].type = EMBER_UNUSED_BINDING;
         return error;
     }
+
+    if (mTail == kNextNullIndex)
+    {
+        mTail = newIndex;
+        mHead = newIndex;
+    }
     else
     {
-        if (mTail == kNextNullIndex)
-        {
-            mTail = newIndex;
-            mHead = newIndex;
-        }
-        else
-        {
-            mNextIndex[mTail]    = newIndex;
-            mNextIndex[newIndex] = kNextNullIndex;
-            mTail                = newIndex;
-        }
-
-        mSize++;
-        return CHIP_NO_ERROR;
+        mNextIndex[mTail]    = newIndex;
+        mNextIndex[newIndex] = kNextNullIndex;
+        mTail                = newIndex;
     }
+
+    mSize++;
+    return CHIP_NO_ERROR;
 }
 
 const EmberBindingTableEntry & BindingTable::GetAt(uint8_t index)