X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.h;h=f39cbe3d536c06cedf2ff870f8e04fda34a7db9d;hp=92c99aee53039611dff999f114d38bb4ffbcec36;hb=c112f7c06e534ce7a5a4e25b6f7f742aeb051850;hpb=bf7d0302ab2ff46038f7002a9eab76f4105c3cee diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 92c99ae..f39cbe3 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.2rc3 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_tool.h Common Header File *****************************************************************************/ @@ -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