X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_rpncalc.h;h=beccfd5e5dc841e73f7385b6a97844913b5b2574;hb=2e6c98e893777e4abf7b05cb4ecf81dde088cdb8;hp=b84f57b2207c019071feab4522986d27d2d24392;hpb=aa4d951ab71eb7fe57840c3baaddf36809806aef;p=rrdtool.git diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h index b84f57b..beccfd5 100644 --- a/src/rrd_rpncalc.h +++ b/src/rrd_rpncalc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.2.10 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007 **************************************************************************** * rrd_rpncalc.h RPN calculator functions ****************************************************************************/ @@ -17,7 +17,8 @@ enum op_en {OP_NUMBER=0,OP_VARIABLE,OP_INF,OP_PREV,OP_NEGINF, OP_MIN,OP_MAX,OP_LIMIT, OP_FLOOR, OP_CEIL, OP_UN,OP_END,OP_LTIME,OP_NE,OP_ISINF,OP_PREV_OTHER,OP_COUNT, OP_ATAN,OP_SQRT,OP_SORT,OP_REV,OP_TREND, - OP_ATAN2,OP_RAD2DEG,OP_DEG2RAD}; + OP_ATAN2,OP_RAD2DEG,OP_DEG2RAD, + OP_AVG}; typedef struct rpnp_t { enum op_en op; @@ -52,7 +53,7 @@ long lookup_DS(void *rrd_vptr, char *ds_name); short rpn_compact(rpnp_t *rpnp,rpn_cdefds_t **rpnc,short *count); rpnp_t * rpn_expand(rpn_cdefds_t *rpnc); void rpn_compact2str(rpn_cdefds_t *rpnc,ds_def_t *ds_def,char **str); -rpnp_t * rpn_parse(void *key_hash,char *expr, long (*lookup)(void *,char *)); +rpnp_t * rpn_parse(void *key_hash,const char *const expr, long (*lookup)(void *,char *)); short rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx, rrd_value_t *output, int output_idx); #endif