X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=f8ab9c48d0fa4e036fb76e7c89c4b64148ba4d0c;hb=818549a636c390fb4a8390a7e2195a52293cd56b;hp=09cda43d97888e3c76564ad4d720fcf5aab352e4;hpb=fbe390e15d3484315efe5802577249c8959e3556;p=rrdtool.git diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 09cda43..f8ab9c4 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.21 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.h Common Header File *****************************************************************************/ @@ -7,7 +7,6 @@ extern "C" { #endif - #ifndef _RRD_TOOL_H #define _RRD_TOOL_H @@ -17,80 +16,6 @@ extern "C" { #include "../win32/config.h" #endif -#ifdef MUST_DISABLE_SIGFPE -#include -#endif - -#ifdef MUST_DISABLE_FPMASK -#include -#endif - -#include -#include -#include -#include -#include -#include - -#if HAVE_SYS_PARAM_H -# include -#endif - -#ifndef MAXPATH -# define MAXPATH 1024 -#endif - -#if HAVE_MATH_H -# include -#endif -/* Sorry: don't know autoconf as well how to check the exist of - dirent.h ans sys/stat.h -*/ - -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif - -#if HAVE_SYS_TYPES_H -# include -#endif - -#if HAVE_SYS_STAT_H -# include -#endif - - -#if HAVE_UNISTD_H -# include -#endif -#if HAVE_SYS_TIME_H -# include -#endif -#if HAVE_SYS_TIMES_H -# include -#endif -#if HAVE_SYS_RESOURCE_H -# include -#if (defined(__svr4__) && defined(__sun__)) -/* Solaris headers (pre 2.6) don't have a getrusage prototype. - Use this instead. */ -extern int getrusage(int, struct rusage *); -#endif /* __svr4__ && __sun__ */ -#endif - #include "rrd.h" #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) @@ -108,7 +33,7 @@ char *strtok_r(char *str, const char *sep, char **last); #else /* unix-only includes */ -#ifndef isnan +#if !defined isnan && !defined HAVE_ISNAN int isnan(double value); #endif @@ -124,7 +49,7 @@ int isnan(double value); #ifndef min #define min(a,b) ((a) < (b) ? (a) : (b)) -#endif +#endif #define DIM(x) (sizeof(x)/sizeof(x[0])) @@ -171,11 +96,18 @@ void rrd_free(rrd_t *rrd); void rrd_freemem(void *mem); void rrd_init(rrd_t *rrd); -int rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr); +rrd_file_t* rrd_open(const char * const file_name, rrd_t *rrd, unsigned rdwr); +int rrd_close(rrd_file_t* rrd_file); +ssize_t rrd_read(rrd_file_t* rrd_file, void*buf, size_t count); +ssize_t rrd_write(rrd_file_t* rrd_file, const void*buf, size_t count); +void rrd_flush(rrd_file_t* rrd_file); +off_t rrd_seek(rrd_file_t* rrd_file, off_t off, int whence); +off_t rrd_tell(rrd_file_t* rrd_file); int readfile(const char *file, char **buffer, int skipfirst); #define RRD_READONLY 0 #define RRD_READWRITE 1 +#define RRD_CREAT 2 enum cf_en cf_conv(const char *string); enum dst_en dst_conv(char *string);