X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_rpncalc.c;h=ed086626d1d21923aae50e904ad8821ede5ee459;hb=814e92743992bce5d50dd662a4f661e50f4ab1ba;hp=2fc6ca77ee2cdd6598a914f888e34a1849ab48f3;hpb=caa48b895c886c615896aff2ff635e8956378861;p=rrdtool.git diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c index 2fc6ca7..ed08662 100644 --- a/src/rrd_rpncalc.c +++ b/src/rrd_rpncalc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 **************************************************************************** * rrd_rpncalc.c RPN calculator functions ****************************************************************************/ @@ -288,8 +288,9 @@ rpnp_t *rpn_parse( long steps = -1; rpnp_t *rpnp; char vname[MAX_VNAME_LEN + 10]; - char *old_locale; - old_locale = setlocale(LC_NUMERIC,"C"); + char *old_locale; + + old_locale = setlocale(LC_NUMERIC, "C"); rpnp = NULL; expr = (char *) expr_const; @@ -297,10 +298,10 @@ rpnp_t *rpn_parse( while (*expr) { if ((rpnp = (rpnp_t *) rrd_realloc(rpnp, (++steps + 2) * sizeof(rpnp_t))) == NULL) { - setlocale(LC_NUMERIC,old_locale); + setlocale(LC_NUMERIC, old_locale); return NULL; } - + else if ((sscanf(expr, "%lf%n", &rpnp[steps].val, &pos) == 1) && (expr[pos] == ',')) { rpnp[steps].op = OP_NUMBER; @@ -382,7 +383,7 @@ rpnp_t *rpn_parse( } else { - setlocale(LC_NUMERIC,old_locale); + setlocale(LC_NUMERIC, old_locale); free(rpnp); return NULL; } @@ -392,13 +393,13 @@ rpnp_t *rpn_parse( if (*expr == ',') expr++; else { - setlocale(LC_NUMERIC,old_locale); + setlocale(LC_NUMERIC, old_locale); free(rpnp); return NULL; } } rpnp[steps + 1].op = OP_END; - setlocale(LC_NUMERIC,old_locale); + setlocale(LC_NUMERIC, old_locale); return rpnp; }