X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd.h;h=5f4145bde9a5d81c32a0156e354e18b65d795a06;hb=9cd66f2d7fbf16ca07e1709cd156ae78cd0da278;hp=0403a266123c3bc0bdc34f710c16c97832452ef7;hpb=c5200a11ec773ecc9bc2d30ffadd0af4a2317741;p=rrdtool.git

diff --git a/src/rrd.h b/src/rrd.h
index 0403a26..5f4145b 100644
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.23  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3rc7  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrdlib.h   Public header file for librrd
  *****************************************************************************
@@ -57,6 +57,21 @@ extern    "C" {
 #include <time.h>
 #include <stdio.h>      /* for FILE */
 
+
+/* Formerly rrd_nan_inf.h */
+#ifndef DNAN
+# define DNAN set_to_DNAN()
+#endif
+
+#ifndef DINF
+# define DINF set_to_DINF()
+#endif
+    double    set_to_DNAN(
+    void);
+    double    set_to_DINF(
+    void);
+/* end of rrd_nan_inf.h */
+
 /* Transplanted from rrd_format.h */
     typedef double rrd_value_t; /* the data storage type is
                                  * double */
@@ -71,6 +86,35 @@ extern    "C" {
         off_t     pos;  /* current pos in file */
     } rrd_file_t;
 
+/* rrd info interface */
+    typedef struct rrd_blob_t {
+        unsigned long size; /* size of the blob */
+        unsigned char *ptr; /* pointer */
+    } rrd_blob_t;
+
+    enum info_type { RD_I_VAL = 0,
+        RD_I_CNT,
+        RD_I_STR,
+        RD_I_INT,
+        RD_I_BLO
+    };
+
+    typedef union infoval {
+        unsigned long u_cnt;
+        rrd_value_t u_val;
+        char     *u_str;
+        int       u_int;
+        struct rrd_blob_t u_blo;
+    } infoval;
+
+    typedef struct info_t {
+        char     *key;
+        enum info_type type;
+        union infoval value;
+        struct info_t *next;
+    } info_t;
+
+
 /* main function blocks */
     int       rrd_create(
     int,
@@ -87,15 +131,9 @@ extern    "C" {
     FILE *,
     double *,
     double *);
-
-    unsigned char *rrd_graph_in_memory(
-    int argc,
-    char **argv,
-    int *xsize,
-    int *ysize,
-    double *ymin,
-    double *ymax,
-    size_t * img_size);
+    info_t   *rrd_graph_v(
+    int,
+    char **);
 
     int       rrd_fetch(
     int,
@@ -193,10 +231,8 @@ extern    "C" {
 /* END parsetime.h */
 
     struct rrd_context {
-        int       len;
-        int       errlen;
-        char     *lib_errstr;
-        char     *rrd_error;
+        char     lib_errstr[256];
+        char     rrd_error[4096];
     };
 
 /* returns the current per-thread rrd_context */