@@ -352,27 +352,28 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
352
352
break ;
353
353
354
354
case kDeviceOption_Version :
355
- LinuxDeviceOptions::GetInstance ().payload .version = static_cast <uint8_t >(atoi (aValue));
355
+ LinuxDeviceOptions::GetInstance ().payload .version = static_cast <uint8_t >(strtoul (aValue, nullptr , 0 ));
356
356
break ;
357
357
358
358
case kDeviceOption_VendorID :
359
- LinuxDeviceOptions::GetInstance ().payload .vendorID = static_cast <uint16_t >(atoi (aValue));
359
+ LinuxDeviceOptions::GetInstance ().payload .vendorID = static_cast <uint16_t >(strtoul (aValue, nullptr , 0 ));
360
360
break ;
361
361
362
362
case kDeviceOption_ProductID :
363
- LinuxDeviceOptions::GetInstance ().payload .productID = static_cast <uint16_t >(atoi (aValue));
363
+ LinuxDeviceOptions::GetInstance ().payload .productID = static_cast <uint16_t >(strtoul (aValue, nullptr , 0 ));
364
364
break ;
365
365
366
366
case kDeviceOption_CustomFlow :
367
- LinuxDeviceOptions::GetInstance ().payload .commissioningFlow = static_cast <CommissioningFlow>(atoi (aValue));
367
+ LinuxDeviceOptions::GetInstance ().payload .commissioningFlow = static_cast <CommissioningFlow>(strtoul (aValue, nullptr , 0 ));
368
368
break ;
369
369
370
370
case kDeviceOption_Capabilities :
371
- LinuxDeviceOptions::GetInstance ().payload .rendezvousInformation .Emplace ().SetRaw (static_cast <uint8_t >(atoi (aValue)));
371
+ LinuxDeviceOptions::GetInstance ().payload .rendezvousInformation .Emplace ().SetRaw (
372
+ static_cast <uint8_t >(strtoul (aValue, nullptr , 0 )));
372
373
break ;
373
374
374
375
case kDeviceOption_Discriminator : {
375
- uint16_t value = static_cast <uint16_t >(atoi (aValue));
376
+ uint16_t value = static_cast <uint16_t >(strtoul (aValue, nullptr , 0 ));
376
377
if (value >= 4096 )
377
378
{
378
379
PrintArgError (" %s: invalid value specified for discriminator: %s\n " , aProgram, aValue);
@@ -386,7 +387,7 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
386
387
}
387
388
388
389
case kDeviceOption_Passcode :
389
- LinuxDeviceOptions::GetInstance ().payload .setUpPINCode = static_cast <uint32_t >(atoi (aValue));
390
+ LinuxDeviceOptions::GetInstance ().payload .setUpPINCode = static_cast <uint32_t >(strtoul (aValue, nullptr , 0 ));
390
391
break ;
391
392
392
393
case kDeviceOption_Spake2pSaltBase64 : {
@@ -476,11 +477,9 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
476
477
case kDeviceOption_SecuredCommissionerPort :
477
478
LinuxDeviceOptions::GetInstance ().securedCommissionerPort = static_cast <uint16_t >(atoi (aValue));
478
479
break ;
479
- case kCommissionerOption_FabricID : {
480
- char * eptr;
481
- LinuxDeviceOptions::GetInstance ().commissionerFabricId = (chip::FabricId) strtoull (aValue, &eptr, 0 );
480
+ case kCommissionerOption_FabricID :
481
+ LinuxDeviceOptions::GetInstance ().commissionerFabricId = static_cast <chip::FabricId>(strtoull (aValue, nullptr , 0 ));
482
482
break ;
483
- }
484
483
#endif
485
484
486
485
case kDeviceOption_Command :
0 commit comments