@@ -35,8 +35,7 @@ static SerialVariant DeserialVariant(char (&szMutStr)[NEO_XHAIR_SEQMAX], const i
3535 int *idx, const ESerialVariantType eType, const SerialVariant varDefault, int *piSkipIdx,
3636 const SerialVariant varMin, const SerialVariant varMax)
3737{
38- SerialVariant var = {};
39- V_memcpy (&var, &varDefault, sizeof (SerialVariant));
38+ SerialVariant var = varDefault;
4039 if (*piSkipIdx > 0 )
4140 {
4241 --(*piSkipIdx);
@@ -61,23 +60,23 @@ static SerialVariant DeserialVariant(char (&szMutStr)[NEO_XHAIR_SEQMAX], const i
6160 {
6261 case SERIALVARIANTTYPE_INT:
6362 {
64- const int iInitVal = atoi (pszCurSegment);
63+ const int iInitVal = V_atoi (pszCurSegment);
6564 var.iVal = (varMin.iVal < varMax.iVal ) ? clamp (iInitVal, varMin.iVal , varMax.iVal ) : iInitVal;
6665 } break ;
6766 case SERIALVARIANTTYPE_BOOL:
6867 {
69- var.bVal = (atoi (pszCurSegment) != 0 );
68+ var.bVal = (V_atoi (pszCurSegment) != 0 );
7069 } break ;
7170 case SERIALVARIANTTYPE_FLOAT:
7271 {
73- const float flInitVal = static_cast <float >(atof (pszCurSegment));
72+ const float flInitVal = static_cast <float >(V_atof (pszCurSegment));
7473 var.flVal = (varMin.flVal < varMax.flVal ) ? clamp (flInitVal, varMin.flVal , varMax.flVal ) : flInitVal;
7574 } break ;
7675 }
7776 }
7877 else if (endCh == CH_XH_SEGSKIP) // Run-length encoding skip
7978 {
80- const int iSkipLen = atoi (pszCurSegment);
79+ const int iSkipLen = V_atoi (pszCurSegment);
8180 if (iSkipLen > 1 )
8281 {
8382 *piSkipIdx = iSkipLen - 1 ;
0 commit comments