port forward of fixes from the stable version of rrd_cgi

[rrdtool.git] / src / rrd_graph.h

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 0f9079a..13f7160 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -6,12 +6,14 @@
 #include "rrd_gfx.h"
 
 #define MAX_VNAME_LEN 29
-#define DEF_NAM_FMT "%29[_A-Za-z0-9]"
+#define DEF_NAM_FMT "%29[-_A-Za-z0-9]"
 
 #define ALTYGRID       0x01    /* use alternative y grid algorithm */
 #define ALTAUTOSCALE   0x02    /* use alternative algorithm to find lower and upper bounds */
 #define ALTAUTOSCALE_MAX 0x04  /* use alternative algorithm to find upper bounds */
 #define NOLEGEND       0x08    /* use no legend */
+#define NOMINOR         0x20    /* Turn off minor gridlines */
+#define ONLY_GRAPH      0x24   /* use only graph */
 
 
 enum tmt_en {TMT_SECOND=0,TMT_MINUTE,TMT_HOUR,TMT_DAY,
@@ -127,6 +129,7 @@ typedef struct image_desc_t {
     /* configuration of graph */
 
     char           graphfile[MAXPATH]; /* filename for graphic */
+    FILE         *graphhandle;        /* FILE to use if filename is "-" */
     long           xsize,ysize,piesize;    /* graph area size in pixels */
     gfx_color_t    graph_col[__GRC_END__]; /* real colors for the graph */   
     text_prop_t    text_prop[TEXT_PROP_LAST]; /* text properties */
@@ -181,7 +184,7 @@ enum gf_en gf_conv(char *);
 enum gfx_if_en if_conv(char *);
 enum tmt_en tmt_conv(char *);
 enum grc_en grc_conv(char *);
-enum grc_en text_prop_conv(char *);
+enum text_prop_en text_prop_conv(char *);
 int im_free(image_desc_t *);
 void auto_scale( image_desc_t *,  double *, char **, double *);
 void si_unit( image_desc_t *);
@@ -209,7 +212,7 @@ int graph_paint(image_desc_t *, char ***);
 void pie_part(image_desc_t *, gfx_color_t, double, double, double, double, double);
 int gdes_alloc(image_desc_t *);
 int scan_for_col(char *, int, char *);
-int rrd_graph(int, char **, char ***, int *, int *);
+int rrd_graph(int, char **, char ***, int *, int *, FILE *);
 void rrd_graph_init(image_desc_t *);
 void rrd_graph_options(int, char **, image_desc_t *);
 void rrd_graph_script(int, char **, image_desc_t *);