@@ -351,20 +351,20 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetSecondaryPairingHint
351
351
template <class ConfigClass >
352
352
CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetSoftwareVersionString(char * buf, size_t bufSize)
353
353
{
354
- ChipError err = CHIP_NO_ERROR;
354
+ ChipError err = CHIP_NO_ERROR;
355
355
size_t softwareVersionStringLen = 0 ; // without counting null-terminator
356
356
357
357
err = ReadConfigValueStr (ConfigClass::kConfigKey_SoftwareVersionString , buf, bufSize, softwareVersionStringLen);
358
- # ifdef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
358
+
359
359
if (CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING[0 ] != 0 && err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
360
360
{
361
361
ReturnErrorCodeIf (bufSize < sizeof (CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING), CHIP_ERROR_BUFFER_TOO_SMALL);
362
362
memcpy (buf, CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING, sizeof (CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING));
363
363
softwareVersionStringLen = sizeof (CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING) - 1 ;
364
- err = CHIP_NO_ERROR;
364
+ err = CHIP_NO_ERROR;
365
365
}
366
- # endif
367
- ReturnErrorOnFailure (err);
366
+
367
+ VerifyOrReturnError (err == CHIP_NO_ERROR, CHIP_ERROR_INTERNAL );
368
368
369
369
ReturnErrorCodeIf (softwareVersionStringLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
370
370
ReturnErrorCodeIf (buf[softwareVersionStringLen] != 0 , CHIP_ERROR_INVALID_STRING_LENGTH);
@@ -373,29 +373,32 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetSoftwareVersionStrin
373
373
}
374
374
375
375
template <class ConfigClass >
376
- CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreSerialNumber(const char * serialNum, size_t serialNumLen )
376
+ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreSerialNumber(chip::Span< const char > serialNumber )
377
377
{
378
- return WriteConfigValueStr (ConfigClass::kConfigKey_SerialNum , serialNum, serialNumLen );
378
+ return WriteConfigValueStr (ConfigClass::kConfigKey_SerialNum , serialNumber. data (), serialNumber. size () );
379
379
}
380
380
template <class ConfigClass >
381
- CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreVendorName(const char * vendorName, size_t vendorNameLen )
381
+ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreVendorName(chip::Span< const char > vendorName)
382
382
{
383
- return WriteConfigValueStr (ConfigClass::kConfigKey_VendorName , vendorName, vendorNameLen);
383
+
384
+ return WriteConfigValueStr (ConfigClass::kConfigKey_VendorName , vendorName.data (), vendorName.size ());
384
385
}
385
386
template <class ConfigClass >
386
- CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreProductName(const char * productName, size_t productNameLen )
387
+ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreProductName(chip::Span< const char > productName)
387
388
{
388
- return WriteConfigValueStr (ConfigClass::kConfigKey_ProductName , productName, productNameLen );
389
+ return WriteConfigValueStr (ConfigClass::kConfigKey_ProductName , productName. data (), productName. size () );
389
390
}
390
391
template <class ConfigClass >
391
- CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreHardwareVersionString(const char * hardwareVersionString, size_t hardwareVersionStringLen )
392
+ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreHardwareVersionString(chip::Span< const char > hardwareVersionString)
392
393
{
393
- return WriteConfigValueStr (ConfigClass::kConfigKey_HardwareVersionString , hardwareVersionString, hardwareVersionStringLen);
394
+ return WriteConfigValueStr (ConfigClass::kConfigKey_HardwareVersionString , hardwareVersionString.data (),
395
+ hardwareVersionString.size ());
394
396
}
395
397
template <class ConfigClass >
396
- CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreSoftwareVersionString(const char * softwareVersionString, size_t softwareVersionStringLen )
398
+ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreSoftwareVersionString(chip::Span< const char > softwareVersionString)
397
399
{
398
- return WriteConfigValueStr (ConfigClass::kConfigKey_SoftwareVersionString , softwareVersionString, softwareVersionStringLen);
400
+ return WriteConfigValueStr (ConfigClass::kConfigKey_SoftwareVersionString , softwareVersionString.data (),
401
+ softwareVersionString.size ());
399
402
}
400
403
401
404
template <class ConfigClass >
0 commit comments