nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/argparse scale decimals to int for return to user 

scales the fractional portion of the parsed number
by ARGPARSE_FRAC_DEC_MULTIPLIER

   Example ARGPARSE_FRAC_DEC_MULTIPLIER = 10 000
   meaning .0009 returns 9   , 9    / 10000 = .0009
           .009  returns 90
           .099  returns 990
           .09   returns 900
           .9    returns 9000
           .9999 returns 9999

Change-Id: I38573dbc1877760b0d52df8686a6647894d76196
This commit is contained in:
William Wilgus 2021-08-30 21:54:38 -04:00 committed by William Wilgus
parent d929444a41
commit c04a944c98
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apps/plugins/lib/arg_helper.c
View File

@ -88,7 +88,6 @@ int char_parse(const char **parameter, char* character)
}
int bool_parse(const char **parameter, bool *choice)
{
/* determine true false using the first character the rest are skipped/ignored */
@ -113,15 +112,25 @@ int bool_parse(const char **parameter, bool *choice)
return found;
}
int longnum_parse(const char **parameter, long *number, long *decimal)
int longnum_parse(const char **parameter, long *number, unsigned long *decimal)
{
/* passes number and or decimal portion of number base 10 only.. */
/* passes number and or decimal portion of number base 10 only..
fractional portion is scaled by ARGPARSE_FRAC_DEC_MULTIPLIER
Example (if ARGPARSE_FRAC_DEC_MULTIPLIER = 10 000)
meaning .0009 returns 9 , 9 / 10000 = .0009
.009 returns 90
.099 returns 990
.09 returns 900
.9 returns 9000
.9999 returns 9999
*/
long num = 0;
long dec = 0;
int found = 0;
int neg = 0;
logf ("n: %s\n", *parameter);
int digits = 0;
//logf ("n: %s\n", *parameter);
const char *start = *parameter;
if (*start == '-')
@ -139,11 +148,28 @@ int longnum_parse(const char **parameter, long *number, long *decimal)
if (*start == DECSEPCHAR)
{
start++;
while(*start == '0')
{
digits++;
start++;
}
while (isdigit(*start))
{
dec = dec *10 + *start - '0';
digits++;
start++;
}
if (decimal && digits <= AP_MAX_FRAC_DIGITS)
{
if(digits < AP_MAX_FRAC_DIGITS)
{
digits = AP_MAX_FRAC_DIGITS - digits;
while (digits--)
dec *= 10;
}
}
else
dec = -1; /* error */
}
if (found > 0)
@ -165,13 +191,10 @@ int num_parse(const char **parameter, int *number, int *decimal)
{
long num, dec;
int ret = longnum_parse(parameter, &num, &dec);
if(number)
*number = num;
if (decimal)
*decimal = dec;
return ret;
}

6
apps/plugins/lib/arg_helper.h
View File

@ -23,6 +23,12 @@
#include "plugin.h"
#define ARGP_MAX_FRAC_DIGITS 9 /* Uses 30 bits max (0.999999999) */
#define ARGP_EXP(a, b) (a ##E## b)
#define ARGP_FRAC_DEC_MULTIPLIER(n) AP_EXP(1,n) /*1x10^n*/
#define ARGPARSE_FRAC_DEC_MULTIPLIER (long) ARGP_FRAC_DEC_MULTIPLIER(ARGP_MAX_FRAC_DIGITS)
/* fills buf with a string upto buf_sz, null terminates the buffer
* strings break on WS by default but can be enclosed in single or double quotes
* opening and closing quotes will not be included in the buffer but will be counted