X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd.h;h=902f72ad598f993e47e5e773811341aa1635c5ba;hb=61a736a2e1ad057f78cb5c2245207c9d02d86f29;hp=078e29ecc5621a3e2efb6f1309cfc1023d197ba8;hpb=0dd9e81745110d811a021513843c05fead623b8d;p=rrdtool.git

diff --git a/src/rrd.h b/src/rrd.h
index 078e29e..902f72a 100644
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -5,6 +5,15 @@
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.7  2003/11/12 22:14:26  oetiker
+ * allow to pass an open filehandle into rrd_graph as an extra argument
+ *
+ * Revision 1.6  2003/11/11 19:46:21  oetiker
+ * replaced time_value with rrd_time_value as MacOS X introduced a struct of that name in their standard headers
+ *
+ * Revision 1.5  2003/04/25 18:35:08  jake
+ * Alternate update interface, updatev. Returns info about CDPs written to disk as result of update. Output format is similar to rrd_info, a hash of key-values.
+ *
  * Revision 1.4  2003/04/01 22:52:23  jake
  * Fix Win32 build. VC++ 6.0 and 7.0 now use the thread-safe code.
  *
@@ -47,7 +56,7 @@ typedef double       rrd_value_t;         /* the data storage type is
 /* main function blocks */
 int    rrd_create(int, char **);
 int    rrd_update(int, char **);
-int    rrd_graph(int, char **, char ***, int *, int *);
+int    rrd_graph(int, char **, char ***, int *, int *, FILE *);
 int    rrd_fetch(int, char **, time_t *, time_t *, unsigned long *,
 		 unsigned long *, char ***, rrd_value_t **);
 int    rrd_restore(int, char **);
@@ -63,7 +72,7 @@ int    rrd_xport(int, char **, int *, time_t *, time_t *,
 int    rrd_create_r(char *filename,
 		    unsigned long pdp_step, time_t last_up,
 		    int argc, char **argv);
-/* NOTE: rrd_update_r is only thread-safe if no at-style time
+/* NOTE: rrd_update_r are only thread-safe if no at-style time
    specifications get used!!! */
 int    rrd_update_r(char *filename, char *_template,
 		    int argc, char **argv);
@@ -79,7 +88,7 @@ typedef enum {
 
 #define TIME_OK NULL
 
-struct time_value {
+struct rrd_time_value {
   timetype type;
   long offset;
   struct tm tm;
@@ -95,10 +104,10 @@ struct rrd_context {
 /* returns the current per-thread rrd_context */
 struct rrd_context *rrd_get_context(void);
 
-char *parsetime(char *spec, struct time_value *ptv);
+char *parsetime(char *spec, struct rrd_time_value *ptv);
 /* END parsetime.h */
 
-int proc_start_end (struct time_value *,  struct time_value *, time_t *, time_t *);
+int proc_start_end (struct rrd_time_value *,  struct rrd_time_value *, time_t *, time_t *);
 
 /* HELPER FUNCTIONS */
 void rrd_set_error(char *,...);