Skip to content

Commit 601f2cc

Browse files
ratgrratgr
committed
[PATCH] Restyled by clang-format
1 parent 1e118db commit 601f2cc

19 files changed

+101
-78
lines changed

‎src/app/AttributePathExpandIterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <app/AttributePathExpandIterator.h>
1818

1919
#include <app/GlobalAttributes.h>
20-
#include <app/data-model/MetadataList.h>
2120
#include <app/data-model-provider/MetadataLookup.h>
2221
#include <app/data-model-provider/MetadataTypes.h>
22+
#include <app/data-model/MetadataList.h>
2323
#include <lib/core/DataModelTypes.h>
2424
#include <lib/support/CodeUtils.h>
2525

‎src/app/CommandHandlerInterface.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
namespace chip {
3131
namespace app {
3232
namespace DataModel {
33-
struct AcceptedCommandEntry;
33+
struct AcceptedCommandEntry;
3434
}
3535

3636
/*
@@ -126,7 +126,8 @@ class CommandHandlerInterface
126126
* This is used by callbacks that just look for a particular value in the
127127
* list.
128128
*/
129-
virtual CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
129+
virtual CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
130+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
130131
{
131132
return CHIP_ERROR_NOT_IMPLEMENTED;
132133
}

‎src/app/InteractionModelEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
#include <app/EventPathParams.h>
3838
#include <app/RequiredPrivilege.h>
3939
#include <app/data-model-provider/ActionReturnStatus.h>
40-
#include <app/data-model/MetadataList.h>
4140
#include <app/data-model-provider/MetadataLookup.h>
4241
#include <app/data-model-provider/MetadataTypes.h>
4342
#include <app/data-model-provider/OperationTypes.h>
4443
#include <app/data-model/List.h>
44+
#include <app/data-model/MetadataList.h>
4545
#include <app/util/IMClusterCommandHandler.h>
4646
#include <app/util/af-types.h>
4747
#include <app/util/endpoint-config-api.h>

‎src/app/clusters/descriptor/descriptor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <app/AttributeAccessInterface.h>
2424
#include <app/AttributeAccessInterfaceRegistry.h>
2525
#include <app/InteractionModelEngine.h>
26-
#include <app/data-model/MetadataList.h>
2726
#include <app/data-model-provider/MetadataTypes.h>
2827
#include <app/data-model/List.h>
28+
#include <app/data-model/MetadataList.h>
2929
#include <app/util/attribute-storage.h>
3030
#include <app/util/endpoint-config-api.h>
3131
#include <lib/core/CHIPError.h>

‎src/app/clusters/device-energy-management-server/device-energy-management-server.cpp

+18-13
Original file line numberDiff line numberDiff line change
@@ -104,48 +104,53 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
104104
}
105105

106106
// CommandHandlerInterface
107-
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
107+
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
108+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
108109
{
109110
using namespace Commands;
110-
using QF = DataModel::CommandQualityFlags;
111-
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
111+
using QF = DataModel::CommandQualityFlags;
112+
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
112113
static const auto kDefaultPrivilege = chip::Access::Privilege::kOperate;
113114

114115
if (HasFeature(Feature::kPowerAdjustment))
115116
{
116117
ReturnErrorOnFailure(builder.AppendElements({
117-
{PowerAdjustRequest::Id, kDefaultFlags, kDefaultPrivilege}, //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
118-
{CancelPowerAdjustRequest::Id, kDefaultFlags, kDefaultPrivilege} //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
118+
{ PowerAdjustRequest::Id, kDefaultFlags,
119+
kDefaultPrivilege }, // TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
120+
{ CancelPowerAdjustRequest::Id, kDefaultFlags,
121+
kDefaultPrivilege } // TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
119122
}));
120123
}
121124

122125
if (HasFeature(Feature::kStartTimeAdjustment))
123126
{
124-
ReturnErrorOnFailure(builder.Append({StartTimeAdjustRequest::Id, kDefaultFlags, kDefaultPrivilege})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
127+
ReturnErrorOnFailure(builder.Append({ StartTimeAdjustRequest::Id, kDefaultFlags,
128+
kDefaultPrivilege })); // TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
125129
}
126130

127131
if (HasFeature(Feature::kPausable))
128132
{
129-
ReturnErrorOnFailure(builder.AppendElements({
130-
{PauseRequest::Id, kDefaultFlags, kDefaultPrivilege},
131-
{ResumeRequest::Id, kDefaultFlags, kDefaultPrivilege}
132-
}));
133+
ReturnErrorOnFailure(builder.AppendElements(
134+
{ { PauseRequest::Id, kDefaultFlags, kDefaultPrivilege }, { ResumeRequest::Id, kDefaultFlags, kDefaultPrivilege } }));
133135
}
134136

135137
if (HasFeature(Feature::kForecastAdjustment))
136138
{
137-
ReturnErrorOnFailure(builder.Append({ModifyForecastRequest::Id, kDefaultFlags, kDefaultPrivilege})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
139+
ReturnErrorOnFailure(builder.Append({ ModifyForecastRequest::Id, kDefaultFlags,
140+
kDefaultPrivilege })); // TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
138141
}
139142

140143
if (HasFeature(Feature::kConstraintBasedAdjustment))
141144
{
142-
ReturnErrorOnFailure(builder.Append({ModifyForecastRequest::Id, kDefaultFlags, kDefaultPrivilege})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
145+
ReturnErrorOnFailure(builder.Append({ ModifyForecastRequest::Id, kDefaultFlags,
146+
kDefaultPrivilege })); // TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
143147
}
144148

145149
if (HasFeature(Feature::kStartTimeAdjustment) || HasFeature(Feature::kForecastAdjustment) ||
146150
HasFeature(Feature::kConstraintBasedAdjustment))
147151
{
148-
ReturnErrorOnFailure(builder.Append({CancelRequest::Id, kDefaultFlags, kDefaultPrivilege})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
152+
ReturnErrorOnFailure(builder.Append({ CancelRequest::Id, kDefaultFlags,
153+
kDefaultPrivilege })); // TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
149154
}
150155

151156
return CHIP_NO_ERROR;

‎src/app/clusters/device-energy-management-server/device-energy-management-server.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
235235

236236
// CommandHandlerInterface
237237
void InvokeCommand(HandlerContext & handlerContext) override;
238-
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
238+
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
239+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
239240

240241
Protocols::InteractionModel::Status CheckOptOutAllowsRequest(AdjustmentCauseEnum adjustmentCause);
241242
void HandlePowerAdjustRequest(HandlerContext & ctx, const Commands::PowerAdjustRequest::DecodableType & commandData);

‎src/app/clusters/energy-evse-server/energy-evse-server.cpp

+11-10
Original file line numberDiff line numberDiff line change
@@ -182,35 +182,36 @@ CHIP_ERROR Instance::Write(const ConcreteDataAttributePath & aPath, AttributeVal
182182
}
183183

184184
// CommandHandlerInterface
185-
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
185+
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
186+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
186187
{
187188
using namespace Commands;
188-
using QF = DataModel::CommandQualityFlags;
189-
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
189+
using QF = DataModel::CommandQualityFlags;
190+
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
190191
static const auto kDefaultPrivilege = chip::Access::Privilege::kOperate;
191192

192193
ReturnErrorOnFailure(builder.AppendElements({
193-
{Disable::Id, kDefaultFlags, kDefaultPrivilege},
194-
{EnableCharging::Id, kDefaultFlags, kDefaultPrivilege},
194+
{ Disable::Id, kDefaultFlags, kDefaultPrivilege },
195+
{ EnableCharging::Id, kDefaultFlags, kDefaultPrivilege },
195196
}));
196197

197198
if (HasFeature(Feature::kV2x))
198199
{
199-
ReturnErrorOnFailure(builder.Append({EnableDischarging::Id, kDefaultFlags, kDefaultPrivilege}) );
200+
ReturnErrorOnFailure(builder.Append({ EnableDischarging::Id, kDefaultFlags, kDefaultPrivilege }));
200201
}
201202

202203
if (HasFeature(Feature::kChargingPreferences))
203204
{
204205
ReturnErrorOnFailure(builder.AppendElements({
205-
{SetTargets::Id, kDefaultFlags, kDefaultPrivilege},
206-
{GetTargets::Id, kDefaultFlags, kDefaultPrivilege},
207-
{ClearTargets::Id, kDefaultFlags, kDefaultPrivilege},
206+
{ SetTargets::Id, kDefaultFlags, kDefaultPrivilege },
207+
{ GetTargets::Id, kDefaultFlags, kDefaultPrivilege },
208+
{ ClearTargets::Id, kDefaultFlags, kDefaultPrivilege },
208209
}));
209210
}
210211

211212
if (SupportsOptCmd(OptionalCommands::kSupportsStartDiagnostics))
212213
{
213-
ReturnErrorOnFailure(builder.Append({StartDiagnostics::Id, kDefaultFlags, kDefaultPrivilege}));
214+
ReturnErrorOnFailure(builder.Append({ StartDiagnostics::Id, kDefaultFlags, kDefaultPrivilege }));
214215
}
215216
return CHIP_NO_ERROR;
216217
}

‎src/app/clusters/energy-evse-server/energy-evse-server.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
200200

201201
// CommandHandlerInterface
202202
void InvokeCommand(HandlerContext & handlerContext) override;
203-
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
203+
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
204+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
204205

205206
void HandleDisable(HandlerContext & ctx, const Commands::Disable::DecodableType & commandData);
206207
void HandleEnableCharging(HandlerContext & ctx, const Commands::EnableCharging::DecodableType & commandData);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*
1717
*/
1818

19-
#include <app/data-model/MetadataList.h>
2019
#include <app-common/zap-generated/attributes/Accessors.h>
2120
#include <app/AttributeAccessInterfaceRegistry.h>
2221
#include <app/CommandHandlerInterfaceRegistry.h>
@@ -25,6 +24,7 @@
2524
#include <app/clusters/microwave-oven-control-server/microwave-oven-control-server.h>
2625
#include <app/clusters/mode-base-server/mode-base-server.h>
2726
#include <app/data-model-provider/MetadataTypes.h>
27+
#include <app/data-model/MetadataList.h>
2828
#include <app/reporting/reporting.h>
2929
#include <app/util/attribute-storage.h>
3030

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

+21-19
Original file line numberDiff line numberDiff line change
@@ -1360,32 +1360,33 @@ void Instance::OnFailSafeTimerExpired()
13601360
}
13611361
}
13621362

1363-
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
1363+
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
1364+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
13641365
{
13651366
using namespace Clusters::NetworkCommissioning::Commands;
1366-
using QF = DataModel::CommandQualityFlags;
1367-
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
1367+
using QF = DataModel::CommandQualityFlags;
1368+
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
13681369
static const auto kDefaultPrivilege = chip::Access::Privilege::kOperate;
13691370

1370-
bool hasNet = mFeatureFlags.Has(Feature::kThreadNetworkInterface);
1371+
bool hasNet = mFeatureFlags.Has(Feature::kThreadNetworkInterface);
13711372
bool hasWifi = mFeatureFlags.Has(Feature::kWiFiNetworkInterface);
13721373
bool hasCred = mFeatureFlags.Has(Feature::kPerDeviceCredentials);
1373-
auto netId = hasNet? AddOrUpdateThreadNetwork::Id : AddOrUpdateWiFiNetwork::Id;
1374-
1375-
static const DataModel::AcceptedCommandEntry commands [6] = {
1376-
{ScanNetworks::Id, kDefaultFlags, kDefaultPrivilege},
1377-
{netId, kDefaultFlags, kDefaultPrivilege},
1378-
{RemoveNetwork::Id, kDefaultFlags, kDefaultPrivilege},
1379-
{ConnectNetwork::Id, kDefaultFlags, kDefaultPrivilege},
1380-
{ReorderNetwork::Id, kDefaultFlags, kDefaultPrivilege},
1381-
{QueryIdentity::Id, kDefaultFlags, kDefaultPrivilege}
1374+
auto netId = hasNet ? AddOrUpdateThreadNetwork::Id : AddOrUpdateWiFiNetwork::Id;
1375+
1376+
static const DataModel::AcceptedCommandEntry commands[6] = {
1377+
{ ScanNetworks::Id, kDefaultFlags, kDefaultPrivilege }, { netId, kDefaultFlags, kDefaultPrivilege },
1378+
{ RemoveNetwork::Id, kDefaultFlags, kDefaultPrivilege }, { ConnectNetwork::Id, kDefaultFlags, kDefaultPrivilege },
1379+
{ ReorderNetwork::Id, kDefaultFlags, kDefaultPrivilege }, { QueryIdentity::Id, kDefaultFlags, kDefaultPrivilege }
13821380
};
13831381

1384-
if(hasNet | hasWifi) {
1385-
//Avoid extra memory allocation
1386-
return builder.ReferenceExisting({commands, size_t{5} + (hasCred? 1 : 0)});
1387-
} else if(hasCred) {
1388-
return builder.ReferenceExisting({commands + 5, size_t{1}});
1382+
if (hasNet | hasWifi)
1383+
{
1384+
// Avoid extra memory allocation
1385+
return builder.ReferenceExisting({ commands, size_t{ 5 } + (hasCred ? 1 : 0) });
1386+
}
1387+
else if (hasCred)
1388+
{
1389+
return builder.ReferenceExisting({ commands + 5, size_t{ 1 } });
13891390
}
13901391

13911392
return CHIP_NO_ERROR;
@@ -1397,7 +1398,8 @@ CHIP_ERROR Instance::EnumerateGeneratedCommands(const ConcreteClusterPath & clus
13971398

13981399
if (mFeatureFlags.HasAny(Feature::kWiFiNetworkInterface, Feature::kThreadNetworkInterface))
13991400
{
1400-
ReturnErrorOnFailure(builder.AppendElements({ ScanNetworksResponse::Id, NetworkConfigResponse::Id, ConnectNetworkResponse::Id }));
1401+
ReturnErrorOnFailure(
1402+
builder.AppendElements({ ScanNetworksResponse::Id, NetworkConfigResponse::Id, ConnectNetworkResponse::Id }));
14011403
}
14021404

14031405
if (mFeatureFlags.Has(Feature::kPerDeviceCredentials))

‎src/app/clusters/network-commissioning/network-commissioning.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ class Instance : public CommandHandlerInterface,
5959

6060
// CommandHandlerInterface
6161
void InvokeCommand(HandlerContext & ctx) override;
62-
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
63-
CHIP_ERROR EnumerateGeneratedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<CommandId> & builder) override;
62+
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
63+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
64+
CHIP_ERROR EnumerateGeneratedCommands(const ConcreteClusterPath & cluster,
65+
DataModel::ListBuilder<CommandId> & builder) override;
6466

6567
// AttributeAccessInterface
6668
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;

‎src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,18 @@ void Instance::InvokeCommand(HandlerContext & handlerContext)
187187
}
188188

189189
// List the commands supported by this instance.
190-
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
190+
CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
191+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
191192
{
192193
using namespace ResourceMonitoring::Commands;
193-
using QF = DataModel::CommandQualityFlags;
194-
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
194+
using QF = DataModel::CommandQualityFlags;
195+
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
195196
static const auto kDefaultPrivilege = chip::Access::Privilege::kOperate;
196197

197198
ChipLogDetail(Zcl, "resourcemonitoring: EnumerateAcceptedCommands");
198199
if (mResetConditionCommandSupported)
199200
{
200-
return builder.Append({ResetCondition::Id, kDefaultFlags, kDefaultPrivilege});
201+
return builder.Append({ ResetCondition::Id, kDefaultFlags, kDefaultPrivilege });
201202
}
202203

203204
return CHIP_NO_ERROR;

‎src/app/clusters/resource-monitoring-server/resource-monitoring-server.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ class Instance : public CommandHandlerInterface, public AttributeAccessInterface
132132

133133
// CommandHandlerInterface
134134
void InvokeCommand(HandlerContext & ctx) override;
135-
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
135+
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
136+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
136137

137138
// AttributeAccessInterface
138139
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;

‎src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ class SoftwareDiagnosticsCommandHandler : public CommandHandlerInterface
6262

6363
void InvokeCommand(HandlerContext & handlerContext) override;
6464

65-
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
65+
CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
66+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder) override;
6667
};
6768

6869
SoftwareDiagosticsAttrAccess gAttrAccess;
@@ -168,19 +169,21 @@ void SoftwareDiagnosticsCommandHandler::InvokeCommand(HandlerContext & handlerCo
168169
handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, status);
169170
}
170171

171-
CHIP_ERROR SoftwareDiagnosticsCommandHandler::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
172+
CHIP_ERROR
173+
SoftwareDiagnosticsCommandHandler::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
174+
DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
172175
{
173176
using namespace Commands;
174-
using QF = DataModel::CommandQualityFlags;
175-
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
177+
using QF = DataModel::CommandQualityFlags;
178+
static const auto kDefaultFlags = chip::BitFlags<QF>(QF::kTimed, QF::kLargeMessage, QF::kFabricScoped);
176179
static const auto kDefaultPrivilege = chip::Access::Privilege::kOperate;
177180
if (!DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks())
178181
{
179182
// No commmands.
180183
return CHIP_NO_ERROR;
181184
}
182185

183-
return builder.Append({ResetWatermarks::Id, kDefaultFlags, kDefaultPrivilege});
186+
return builder.Append({ ResetWatermarks::Id, kDefaultFlags, kDefaultPrivilege });
184187
}
185188

186189
} // anonymous namespace

‎src/app/data-model-provider/ProviderMetadataTree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include <app/ConcreteAttributePath.h>
2222
#include <app/ConcreteClusterPath.h>
2323
#include <app/ConcreteCommandPath.h>
24-
#include <app/data-model/MetadataList.h>
2524
#include <app/data-model-provider/MetadataTypes.h>
2625
#include <app/data-model/List.h>
26+
#include <app/data-model/MetadataList.h>
2727
#include <lib/support/Span.h>
2828

2929
namespace chip {

‎src/app/reporting/Engine.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ DataModel::ActionReturnStatus RetrieveClusterData(DataModel::Provider * dataMode
172172
reportBuilder.Checkpoint(checkpoint);
173173

174174
DataModel::ActionReturnStatus status(CHIP_NO_ERROR);
175-
AttributeValueEncoder attributeValueEncoder ={reportBuilder, subjectDescriptor, path, version, isFabricFiltered, encoderState};
175+
AttributeValueEncoder attributeValueEncoder = {
176+
reportBuilder, subjectDescriptor, path, version, isFabricFiltered, encoderState
177+
};
176178

177179
// TODO: we explicitly DO NOT validate that path is a valid cluster path (even more, above serverClusterFinder
178180
// explicitly ignores that case). This means that global attribute reads as well as ReadAttribute

0 commit comments

Comments
 (0)