Skip to content

Commit 3ecf461

Browse files
restyled-commitshicklin
authored andcommitted
Restyled by clang-format
1 parent 38a7e7a commit 3ecf461

File tree

3 files changed

+134
-66
lines changed

3 files changed

+134
-66
lines changed

examples/rvc-app/rvc-common/src/rvc-service-area-delegate.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ bool RvcServiceAreaDelegate::ModifySupportedMap(uint32_t listIndex, const MapStr
286286
// etc.
287287

288288
// Double-check that mapID's match.
289-
if (modifiedMap.mapID != mSupportedMaps[listIndex].mapID) {
289+
if (modifiedMap.mapID != mSupportedMaps[listIndex].mapID)
290+
{
290291
ChipLogError(Zcl, "ModifySupportedMap - mapID's do not match, new mapID %u, existing mapID %u", modifiedMap.mapID,
291292
mSupportedMaps[listIndex].mapID);
292293
return false;

src/app/clusters/service-area-server/service-area-cluster-objects.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -156,21 +156,21 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
156156
if (aLocationName.empty())
157157
{
158158
locationInfo.locationInfo.Value().locationName = CharSpan(mLocationNameBuffer, 0);
159-
mLocationNameBuffer[0] = '\0';
159+
mLocationNameBuffer[0] = '\0';
160160
}
161161
else if (aLocationName.size() > sizeof(mLocationNameBuffer))
162162
{
163163
// Save the truncated name that fits into available size.
164164
memcpy(mLocationNameBuffer, aLocationName.data(), sizeof(mLocationNameBuffer));
165165
locationInfo.locationInfo.Value().locationName = CharSpan(mLocationNameBuffer, sizeof(mLocationNameBuffer));
166-
mLocationNameBuffer[kLocationNameMaxSize] = '\0';
166+
mLocationNameBuffer[kLocationNameMaxSize] = '\0';
167167
}
168168
else
169169
{
170170
// Save full name.
171171
memcpy(mLocationNameBuffer, aLocationName.data(), aLocationName.size());
172172
locationInfo.locationInfo.Value().locationName = CharSpan(mLocationNameBuffer, aLocationName.size());
173-
mLocationNameBuffer[aLocationName.size()] = '\0';
173+
mLocationNameBuffer[aLocationName.size()] = '\0';
174174
}
175175
}
176176
}
@@ -333,21 +333,21 @@ struct MapStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::M
333333

334334
if (aMapName.empty())
335335
{
336-
name = CharSpan(mMapNameBuffer, 0);
336+
name = CharSpan(mMapNameBuffer, 0);
337337
mMapNameBuffer[0] = '\0';
338338
}
339339
else if (aMapName.size() > sizeof(mMapNameBuffer))
340340
{
341341
// Save the truncated name that fits into available size.
342342
memcpy(mMapNameBuffer, aMapName.data(), sizeof(mMapNameBuffer));
343-
name = CharSpan(mMapNameBuffer, sizeof(mMapNameBuffer));
343+
name = CharSpan(mMapNameBuffer, sizeof(mMapNameBuffer));
344344
mMapNameBuffer[kMapNameMaxSize] = '\0';
345345
}
346346
else
347347
{
348348
// Save full name.
349349
memcpy(mMapNameBuffer, aMapName.data(), aMapName.size());
350-
name = CharSpan(mMapNameBuffer, aMapName.size());
350+
name = CharSpan(mMapNameBuffer, aMapName.size());
351351
mMapNameBuffer[aMapName.size()] = '\0';
352352
}
353353
}

0 commit comments

Comments
 (0)