projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the first TREND* value can be calculated earlier ... -- fredrick (fix for #312)
[rrdtool.git]
/
src
/
rrd_rpncalc.c
diff --git
a/src/rrd_rpncalc.c
b/src/rrd_rpncalc.c
index
80eb144
..
8dd2240
100644
(file)
--- a/
src/rrd_rpncalc.c
+++ b/
src/rrd_rpncalc.c
@@
-297,7
+297,8
@@
rpnp_t *rpn_parse(
char vname[MAX_VNAME_LEN + 10];
char *old_locale;
char vname[MAX_VNAME_LEN + 10];
char *old_locale;
- old_locale = setlocale(LC_NUMERIC, "C");
+ old_locale = setlocale(LC_NUMERIC, NULL);
+ setlocale(LC_NUMERIC, "C");
rpnp = NULL;
expr = (char *) expr_const;
rpnp = NULL;
expr = (char *) expr_const;
@@
-880,7
+881,7
@@
short rpn_calc(
time_t dur = (time_t) rpnstack->s[stptr];
time_t step = (time_t) rpnp[rpi - 2].step;
time_t dur = (time_t) rpnstack->s[stptr];
time_t step = (time_t) rpnp[rpi - 2].step;
- if (output_idx
>
(int) ceil((float) dur / (float) step)) {
+ if (output_idx
+ 1 >=
(int) ceil((float) dur / (float) step)) {
int ignorenan = (rpnp[rpi].op == OP_TREND);
double accum = 0.0;
int i = 0;
int ignorenan = (rpnp[rpi].op == OP_TREND);
double accum = 0.0;
int i = 0;