Use fromCharString more

project-chip · Nov 9, 2023 · 08cdf5f · 08cdf5f
1 parent 5ab9f20
commit 08cdf5f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/examples/all-clusters-app/nxp/mw320/main.cpp b/examples/all-clusters-app/nxp/mw320/main.cpp
@@ -172,7 +172,7 @@ void InitOTARequestor(void)
  // TODO: instatiate and initialize these values when QueryImageResponse tells us an image is available
  // TODO: add API for OTARequestor to pass QueryImageResponse info to the application to use for OTADownloader init
  // OTAImageProcessor ipParams;
- // ipParams.imageFile = CharSpan("dnld_img.txt");
+ // ipParams.imageFile = CharSpan::fromCharString("dnld_img.txt");
  // gImageProcessor.SetOTAImageProcessorParams(ipParams);
  gImageProcessor.SetOTADownloader(&gDownloader);
 

diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp
@@ -186,8 +186,8 @@ class LockManager
  endpoints[0].id = 1;
  uint8_t pin[6] = { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 };
  endpoints[0].credentials[0].set(DlCredentialStatus::kOccupied, CredentialTypeEnum::kPin, chip::ByteSpan(pin));
- endpoints[0].users[0].set(chip::CharSpan("default"), 1, UserStatusEnum::kOccupiedEnabled, UserTypeEnum::kUnrestrictedUser,
- CredentialRuleEnum::kSingle);
+ endpoints[0].users[0].set(chip::CharSpan::fromCharString("default"), 1, UserStatusEnum::kOccupiedEnabled,
+ UserTypeEnum::kUnrestrictedUser, CredentialRuleEnum::kSingle);
  endpoints[0].users[0].addCredential(CredentialTypeEnum::kPin, 1);
  }
 

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

diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -1985,7 +1985,7 @@ Status DoorLockServer::clearUser(chip::EndpointId endpointId, chip::FabricIndex
  }
 
  // Remove the user entry
- if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, chip::CharSpan(""), 0,
+ if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, chip::CharSpan(), 0,
  UserStatusEnum::kAvailable, UserTypeEnum::kUnrestrictedUser, CredentialRuleEnum::kSingle,
  nullptr, 0))
  {

diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
@@ -761,7 +761,7 @@ CHIP_ERROR DefaultOTARequestor::SendQueryImageRequest(Messaging::ExchangeManager
  else
  {
  // Country code unavailable or invalid, use default
- args.location.SetValue(CharSpan("XX", strlen("XX")));
+ args.location.SetValue(CharSpan::fromCharString("XX"));
  }
 
  args.metadataForProvider = mMetadataForProvider;

diff --git a/src/app/clusters/scenes-server/SceneTable.h b/src/app/clusters/scenes-server/SceneTable.h
@@ -186,12 +186,10 @@ class SceneTable
  }
  ~SceneData(){};
 
- bool operator==(const SceneData &other) const {
- return (
- (CharSpan(mName, mNameLength) == CharSpan(other.mName, other.mNameLength)) &&
- (mSceneTransitionTimeMs == other.mSceneTransitionTimeMs) &&
- (mExtensionFieldSets == other.mExtensionFieldSets)
- );
+ bool operator==(const SceneData & other) const
+ {
+ return ((CharSpan(mName, mNameLength) == CharSpan(other.mName, other.mNameLength)) &&
+ (mSceneTransitionTimeMs == other.mSceneTransitionTimeMs) && (mExtensionFieldSets == other.mExtensionFieldSets));
  }
 
  void SetName(const CharSpan & sceneName)

diff --git a/src/credentials/tests/TestFabricTable.cpp b/src/credentials/tests/TestFabricTable.cpp
@@ -943,7 +943,7 @@ void TestBasicAddNocUpdateNocFlow(nlTestSuite * inSuite, void * inContext)
  // Sequence 4: Rename fabric index 2, applies immediately when nothing pending
  {
  NL_TEST_ASSERT_EQUALS(inSuite, fabricTable.FabricCount(), 2);
- NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(2, CharSpan("roboto")));
+ NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(2, CharSpan::fromCharString("roboto")));
  NL_TEST_ASSERT_EQUALS(inSuite, fabricTable.FabricCount(), 2);
 
  NL_TEST_ASSERT_EQUALS(inSuite, storage.GetNumKeys(), numStorageAfterUpdate); // Number of keys unchanged

diff --git a/src/lib/support/tests/TestTlvJson.cpp b/src/lib/support/tests/TestTlvJson.cpp
@@ -134,7 +134,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext)
  "}\n");
 
  const char charBuf[] = "hello";
- CharSpan charSpan = CharSpan::fromCharString(charBuf);
+ CharSpan charSpan  = CharSpan::fromCharString(charBuf);
  EncodeAndValidate(charSpan,
  "{\n"
  " \"value\" : \"hello\"\n"