X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=dbfb26b06add6c1044baaf2df3a610450dc98516;hb=af9f7764a2c25d8b1507911d5acabdcc5ab18aa1;hp=16bd4f27ec2ebeac915d74190a230659421cc0c5;hpb=0dd9e81745110d811a021513843c05fead623b8d;p=rrdtool.git diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 16bd4f2..dbfb26b 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -133,12 +133,14 @@ char *strtok_r(char *str, const char *sep, char **last); /* rrd info interface */ enum info_type { RD_I_VAL=0, RD_I_CNT, - RD_I_STR }; + RD_I_STR, + RD_I_INT }; typedef union infoval { unsigned long u_cnt; rrd_value_t u_val; char *u_str; + int u_int; } infoval; typedef struct info_t { @@ -148,8 +150,10 @@ typedef struct info_t { struct info_t *next; } info_t; - info_t *rrd_info(int, char **); +info_t *rrd_update_v(int, char **); +char * sprintf_alloc(char *, ...); +info_t *info_push(info_t *, char *, enum info_type, infoval); /* HELPER FUNCTIONS */ @@ -167,10 +171,8 @@ void rrd_free(rrd_t *rrd); void rrd_freemem(void *mem); void rrd_init(rrd_t *rrd); -int rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr); -int rrd_open_r(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr); -int readfile(char *file, char **buffer, int skipfirst); -int readfile_r(char *file, char **buffer, int skipfirst); +int rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr); +int readfile(const char *file, char **buffer, int skipfirst); #define RRD_READONLY 0 #define RRD_READWRITE 1 @@ -185,9 +187,6 @@ double rrd_diff(char *a, char *b); thread overwrite the same buffer */ const char *rrd_strerror(int err); -/* just a defensive work-around... */ -#define strerror(x) rrd_strerror(x) - #endif #ifdef __cplusplus