X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_rpncalc.c;h=d98008de2643e5c871faa10f847b573d027b1c5a;hp=1f86f2eb02fc50c93f284a806981bb996ca13a0a;hb=9dba554e59319d13076a8184c7889cca868b4c85;hpb=d7be1cb13eb46f173d994d2f9d71b70e89087f1f diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c index 1f86f2e..d98008d 100644 --- a/src/rrd_rpncalc.c +++ b/src/rrd_rpncalc.c @@ -547,14 +547,14 @@ short rpn_calc( break; case OP_ADDNAN: stackunderflow(1); - if (isnan(rpnstack->s[stptr - 1])) { - rpnstack->s[stptr - 1] = rpnstack->s[stptr]; - } else if (isnan(rpnstack->s[stptr])) { - //rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1]; - } else { - rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1] - + rpnstack->s[stptr]; - } + if (isnan(rpnstack->s[stptr - 1])) { + rpnstack->s[stptr - 1] = rpnstack->s[stptr]; + } else if (isnan(rpnstack->s[stptr])) { + //rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1]; + } else { + rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1] + + rpnstack->s[stptr]; + } stptr--; break; @@ -705,8 +705,10 @@ short rpn_calc( break; case OP_IF: stackunderflow(2); - rpnstack->s[stptr - 2] = ( isnan(rpnstack->s[stptr - 2]) || rpnstack->s[stptr - 2] == 0.0 ) ? - rpnstack->s[stptr] : rpnstack->s[stptr - 1]; + rpnstack->s[stptr - 2] = (isnan(rpnstack->s[stptr - 2]) + || rpnstack->s[stptr - 2] == + 0.0) ? rpnstack->s[stptr] : rpnstack-> + s[stptr - 1]; stptr--; stptr--; break;