X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=56b4568dbd787468410391b3298748a84fdc8cfd;hb=23d1c29c5b06a786817613f266e04887af4945c4;hp=92c99aee53039611dff999f114d38bb4ffbcec36;hpb=bf7d0302ab2ff46038f7002a9eab76f4105c3cee;p=rrdtool.git diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 92c99ae..56b4568 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -140,7 +140,7 @@ typedef union infoval { unsigned long u_cnt; rrd_value_t u_val; char *u_str; - int u_int; + int u_int; } infoval; typedef struct info_t { @@ -171,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 @@ -189,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