X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_rpncalc.h;h=beccfd5e5dc841e73f7385b6a97844913b5b2574;hb=2e6c98e893777e4abf7b05cb4ecf81dde088cdb8;hp=39909a600207ebadbb9c80e3ceb77485f35f9e2d;hpb=fcbf2878a231442f4b62ee95fca39e28f04fc8d2;p=rrdtool.git diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h index 39909a6..beccfd5 100644 --- a/src/rrd_rpncalc.h +++ b/src/rrd_rpncalc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007 **************************************************************************** * rrd_rpncalc.h RPN calculator functions ****************************************************************************/ @@ -16,7 +16,9 @@ enum op_en {OP_NUMBER=0,OP_VARIABLE,OP_INF,OP_PREV,OP_NEGINF, OP_COS,OP_LOG,OP_EXP,OP_LT,OP_LE,OP_GT,OP_GE,OP_EQ,OP_IF, 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_ATAN,OP_SQRT,OP_SORT,OP_REV,OP_TREND, + OP_ATAN2,OP_RAD2DEG,OP_DEG2RAD, + OP_AVG}; typedef struct rpnp_t { enum op_en op; @@ -51,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