Skip to content

Commit 9e09780

Browse files
restyled-commitsyyzhong-g
authored andcommitted
Restyled by clang-format
1 parent df79051 commit 9e09780

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

src/app/EventManagement.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct CopyAndAdjustDeltaTimeContext
8383
void EventManagement::Init(Messaging::ExchangeManager * apExchangeManager, uint32_t aNumBuffers,
8484
CircularEventBuffer * apCircularEventBuffer, const LogStorageResources * const apLogStorageResources,
8585
MonotonicallyIncreasingCounter<EventNumber> * apEventNumberCounter,
86-
System::Clock::Milliseconds64 aMonotonicStartupTime, EventScheduler* apEventScheduler)
86+
System::Clock::Milliseconds64 aMonotonicStartupTime, EventScheduler * apEventScheduler)
8787
{
8888
CircularEventBuffer * current = nullptr;
8989
CircularEventBuffer * prev = nullptr;
@@ -125,9 +125,12 @@ void EventManagement::Init(Messaging::ExchangeManager * apExchangeManager, uint3
125125

126126
mMonotonicStartupTime = aMonotonicStartupTime;
127127

128-
if (apEventScheduler == nullptr) {
128+
if (apEventScheduler == nullptr)
129+
{
129130
mpEventScheduler = &InteractionModelEngine::GetInstance()->GetReportingEngine();
130-
} else {
131+
}
132+
else
133+
{
131134
mpEventScheduler = apEventScheduler;
132135
}
133136
}
@@ -496,7 +499,8 @@ CHIP_ERROR EventManagement::LogEventPrivate(EventLoggingDelegate * apDelegate, c
496499
opts.mTimestamp.mType == Timestamp::Type::kSystem ? "Sys" : "Epoch", ChipLogValueX64(opts.mTimestamp.mValue));
497500
#endif // CHIP_CONFIG_EVENT_LOGGING_VERBOSE_DEBUG_LOGS
498501

499-
if (mpEventScheduler) {
502+
if (mpEventScheduler)
503+
{
500504
err = mpEventScheduler->ScheduleEventDelivery(opts.mPath, mBytesWritten);
501505
}
502506
}

src/app/EventManagement.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ struct LogStorageResources
197197
class EventScheduler
198198
{
199199
public:
200-
virtual ~EventScheduler() = default;
200+
virtual ~EventScheduler() = default;
201201
CHIP_ERROR virtual ScheduleEventDelivery(ConcreteEventPath & aPath, uint32_t aBytesWritten) = 0;
202202
};
203203

@@ -243,8 +243,7 @@ class EventManagement
243243
void Init(Messaging::ExchangeManager * apExchangeManager, uint32_t aNumBuffers, CircularEventBuffer * apCircularEventBuffer,
244244
const LogStorageResources * const apLogStorageResources,
245245
MonotonicallyIncreasingCounter<EventNumber> * apEventNumberCounter,
246-
System::Clock::Milliseconds64 aMonotonicStartupTime,
247-
EventScheduler* apEventScheduler = nullptr);
246+
System::Clock::Milliseconds64 aMonotonicStartupTime, EventScheduler * apEventScheduler = nullptr);
248247

249248
static EventManagement & GetInstance();
250249

@@ -575,7 +574,7 @@ class EventManagement
575574

576575
System::Clock::Milliseconds64 mMonotonicStartupTime;
577576

578-
EventScheduler* mpEventScheduler = nullptr;
577+
EventScheduler * mpEventScheduler = nullptr;
579578
};
580579
} // namespace app
581580
} // namespace chip

src/app/reporting/Engine.cpp

+13-9
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@ namespace reporting {
4242

4343
Engine::Engine(InteractionModelEngine * apImEngine) : mpImEngine(apImEngine) {}
4444

45-
CHIP_ERROR Engine::Init(EventManagement* apEventManagement)
45+
CHIP_ERROR Engine::Init(EventManagement * apEventManagement)
4646
{
4747
mNumReportsInFlight = 0;
4848
mCurReadHandlerIdx = 0;
4949

50-
if (apEventManagement == nullptr) {
50+
if (apEventManagement == nullptr)
51+
{
5152
mpEventManagement = &EventManagement::GetInstance();
52-
} else {
53+
}
54+
else
55+
{
5356
mpEventManagement = apEventManagement;
5457
}
5558

@@ -393,17 +396,18 @@ CHIP_ERROR Engine::BuildSingleReportDataEventReports(ReportDataMessage::Builder
393396
size_t eventCount = 0;
394397
bool hasEncodedStatus = false;
395398
TLV::TLVWriter backup;
396-
bool eventClean = true;
397-
auto & eventMin = apReadHandler->GetEventMin();
398-
bool hasMoreChunks = false;
399+
bool eventClean = true;
400+
auto & eventMin = apReadHandler->GetEventMin();
401+
bool hasMoreChunks = false;
399402

400403
aReportDataBuilder.Checkpoint(backup);
401404

402405
VerifyOrExit(apReadHandler->GetEventPathList() != nullptr, );
403406

404407
// If the eventManager is not valid or has not been initialized,
405408
// skip the rest of processing
406-
VerifyOrExit(mpEventManagement != nullptr && mpEventManagement->IsValid(), ChipLogError(DataManagement, "EventManagement has not yet initialized"));
409+
VerifyOrExit(mpEventManagement != nullptr && mpEventManagement->IsValid(),
410+
ChipLogError(DataManagement, "EventManagement has not yet initialized"));
407411

408412
eventClean = apReadHandler->CheckEventClean(*mpEventManagement);
409413

@@ -425,8 +429,8 @@ CHIP_ERROR Engine::BuildSingleReportDataEventReports(ReportDataMessage::Builder
425429
err = CheckAccessDeniedEventPaths(*(eventReportIBs.GetWriter()), hasEncodedStatus, apReadHandler);
426430
SuccessOrExit(err);
427431

428-
err = mpEventManagement->FetchEventsSince(*(eventReportIBs.GetWriter()), apReadHandler->GetEventPathList(), eventMin, eventCount,
429-
apReadHandler->GetSubjectDescriptor());
432+
err = mpEventManagement->FetchEventsSince(*(eventReportIBs.GetWriter()), apReadHandler->GetEventPathList(), eventMin,
433+
eventCount, apReadHandler->GetSubjectDescriptor());
430434

431435
if ((err == CHIP_END_OF_TLV) || (err == CHIP_ERROR_TLV_UNDERRUN) || (err == CHIP_NO_ERROR))
432436
{

src/app/reporting/Engine.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Engine : public EventScheduler
7272
* @retval #CHIP_NO_ERROR On success.
7373
* @retval other Was unable to retrieve data and write it into the writer.
7474
*/
75-
CHIP_ERROR Init(EventManagement* apEventManagement = nullptr);
75+
CHIP_ERROR Init(EventManagement * apEventManagement = nullptr);
7676

7777
void Shutdown();
7878

@@ -287,7 +287,7 @@ class Engine : public EventScheduler
287287

288288
InteractionModelEngine * mpImEngine = nullptr;
289289

290-
EventManagement* mpEventManagement = nullptr;
290+
EventManagement * mpEventManagement = nullptr;
291291
};
292292

293293
}; // namespace reporting

0 commit comments

Comments
 (0)