X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.h;h=40a484601e021f78b3b3af7f081dc82968e105e6;hp=131dcbb97e86fd570a8a97647fb96c72fc1d49ef;hb=HEAD;hpb=58f0dbba0090989a047c65f2590698a29b70df36

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 131dcbb..40a4846 100644
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3.1  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3  Copyright by Tobi Oetiker, 1997-2010
  *****************************************************************************
  * rrd_tool.h   Common Header File
  *****************************************************************************/
@@ -10,10 +10,12 @@ extern    "C" {
 #ifndef _RRD_TOOL_H
 #define _RRD_TOOL_H
 
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
+#else
 #ifdef HAVE_CONFIG_H
 #include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
+#endif
 #endif
 
 #include "rrd.h"
@@ -57,6 +59,8 @@ extern    "C" {
 #include "rrd_getopt.h"
 #endif
 
+#include "rrd_format.h"
+
 #ifndef max
 #define max(a,b) ((a) > (b) ? (a) : (b))
 #endif
@@ -80,22 +84,33 @@ extern    "C" {
 
     int       rrd_create_fn(
     const char *file_name,
-    rrd_t *rrd);
-    int       rrd_fetch_fn(
-    const char *filename,
-    enum cf_en cf_idx,
-    time_t *start,
-    time_t *end,
-    unsigned long *step,
-    unsigned long *ds_cnt,
-    char ***ds_namv,
-    rrd_value_t **data);
+    rrd_t *rrd,
+    int no_overwrite);
+    int rrd_fetch_fn (const char *filename,
+            enum cf_en cf_idx,
+            time_t *start,
+            time_t *end,
+            unsigned long *step,
+            unsigned long *ds_cnt,
+            char ***ds_namv,
+            rrd_value_t **data);
+
+
+#ifdef HAVE_LIBDBI
+int rrd_fetch_fn_libdbi(const char *filename, enum cf_en cf_idx,
+ 			time_t *start,time_t *end,
+ 			unsigned long *step,
+ 			unsigned long *ds_cnt,
+ 			char        ***ds_namv,
+ 			rrd_value_t **data);
+#endif
 
 #define RRD_READONLY    (1<<0)
 #define RRD_READWRITE   (1<<1)
 #define RRD_CREAT       (1<<2)
 #define RRD_READAHEAD   (1<<3)
 #define RRD_COPY        (1<<4)
+#define RRD_EXCL        (1<<5)
 
     enum cf_en cf_conv(
     const char *string);
@@ -104,11 +119,15 @@ extern    "C" {
     long      ds_match(
     rrd_t *rrd,
     char *ds_nam);
+    off_t rrd_get_header_size(
+    rrd_t *rrd);
     double    rrd_diff(
     char *a,
     char *b);
 
-#endif
+    const char *cf_to_string (enum cf_en cf);
+
+#endif /* _RRD_TOOL_H */
 
 #ifdef  __cplusplus
 }