Fixing Checks

Author: ratgr

src/access/ProviderDeviceTypeResolver.h

@@ -16,9 +16,9 @@
 #pragma once
 
 #include <access/AccessControl.h>
-#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/Provider.h>
+#include <app/data-model/MetadataList.h>
 
 namespace chip {
 namespace Access {

src/app/AttributePathExpandIterator.h

@@ -19,9 +19,9 @@
 
 #include <app/AttributePathParams.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/Provider.h>
+#include <app/data-model/MetadataList.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/LinkedList.h>
 #include <lib/support/Span.h>

src/app/CommandHandlerInterface.h

@@ -22,7 +22,7 @@
 #include <app/ConcreteClusterPath.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Decode.h>
-#include <app/data-model/List.h> // So we can encode lists
+#include <app/data-model/List.h>         // So we can encode lists
 #include <app/data-model/MetadataList.h> // So we can get filled buffers
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/Iterators.h>

src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp

@@ -16,7 +16,7 @@
  *
  */
 
-#include "app/data-model-provider/MetadataList.h"
+#include <app/data-model/MetadataList.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandlerInterfaceRegistry.h>

src/app/clusters/network-commissioning/network-commissioning.cpp

@@ -1383,9 +1383,9 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
 
     if(hasNet | hasWifi) {
         //Avoid extra memory allocation
-        return builder.ReferenceExisting({commands, 5 + hasCred? 1 : 0});
+        return builder.ReferenceExisting({commands, 5z + (hasCred? 1z : 0z)});
     } else if(hasCred) {
-        return builder.ReferenceExisting({commands + 5, 1});
+        return builder.ReferenceExisting({commands + 5z, 1z});
     }
 
     return CHIP_NO_ERROR;