Followup on post-merge comments on #30393 (#30421)

* Use _span * Remove comment * Fix alignment * restyle * Remove extra bracket * Fix init --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com>
project-chip · Nov 12, 2023 · be5a949 · be5a949
1 parent f06d952
commit be5a949
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/examples/placeholder/linux/static-supported-temperature-levels.cpp b/examples/placeholder/linux/static-supported-temperature-levels.cpp
@@ -27,9 +27,7 @@ using namespace chip::app::Clusters::TemperatureControl;
 using chip::Protocols::InteractionModel::Status;
 
 // TODO: Configure your options for each endpoint
-CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { CharSpan::fromCharString("Hot"),
- CharSpan::fromCharString("Warm"),
- CharSpan::fromCharString("Cold") };
+CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { "Hot"_span, "Warm"_span, "Cold"_span };
 
 const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints
  [EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = {

diff --git a/src/app/clusters/scenes-server/SceneTableImpl.cpp b/src/app/clusters/scenes-server/SceneTableImpl.cpp
@@ -209,7 +209,6 @@ struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneB
 
  CHIP_ERROR Serialize(TLV::TLVWriter & writer) const override
  {
- // TODO: if we have mNameLength, should this bin ByteSpan instead?
  CharSpan nameSpan(mStorageData.mName, mStorageData.mNameLength);
  TLV::TLVType container;
  ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, container));

diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -551,7 +551,7 @@ void TimeSynchronizationServer::InitTimeZone()
  for (auto & tzStore : mTimeZoneObj.timeZoneList)
  {
  memset(tzStore.name, 0, sizeof(tzStore.name));
- tzStore.timeZone = { .offset = 0, .validAt = 0, .name = MakeOptional(CharSpan(tzStore.name, 0)) };
+ tzStore.timeZone = { .offset = 0, .validAt = 0, .name = chip::NullOptional };
  }
 }
 

diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
@@ -588,7 +588,7 @@ using CHIP_ERROR = ::chip::ChipError;
  * Invalid UTF8 string (contains some characters that are invalid)
  *
  */
-#define CHIP_ERROR_INVALID_UTF8 CHIP_CORE_ERROR(0x12)
+#define CHIP_ERROR_INVALID_UTF8  CHIP_CORE_ERROR(0x12)
 
 /**
  * @def CHIP_ERROR_INTEGRITY_CHECK_FAILED