cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwNumericConvert.h : string_to_number() now recognizes hex numbers.

Browse Source
This commit is contained in:
kevin 2023-05-21 12:38:47 -04:00
parent f5c1c5e435
commit 55f8655316
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cwNumericConvert.h
View File

@ -78,9 +78,14 @@ namespace cw
valueRef = 0; // BUG BUG BUG why is this not an error ???? valueRef = 0; // BUG BUG BUG why is this not an error ????
else else
{ {
int base = 10;
errno = 0; errno = 0;
long v = strtol(s,nullptr,10);
if( v == 0 and errno != 0) if( strlen(s) >= 2 && s[0]=='0' && s[1]=='x' )
base = 16;
long v = strtol(s,nullptr,base);
if( v == 0 && errno != 0)
return cwLogError(kOpFailRC,"String to number conversion failed on '%s'.", cwStringNullGuard(s)); return cwLogError(kOpFailRC,"String to number conversion failed on '%s'.", cwStringNullGuard(s));
return numeric_convert(v,valueRef); return numeric_convert(v,valueRef);
@ -98,7 +103,7 @@ namespace cw
{ {
errno = 0; errno = 0;
valueRef = strtod(s,nullptr); valueRef = strtod(s,nullptr);
if( valueRef == 0 and errno != 0) if( valueRef == 0 && errno != 0)
return cwLogError(kOpFailRC,"String to number conversion failed on '%s'.", cwStringNullGuard(s)); return cwLogError(kOpFailRC,"String to number conversion failed on '%s'.", cwStringNullGuard(s));
} }