X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=action_graph.c;h=a0f257e47b4d168571c02d0e8f2660af39194d67;hb=7a6beaf075a32bfd93d314c00179f258c8e43ee5;hp=b5b3163df7433d073a040e30feb61298e77e5891;hpb=b2db68ebb7acdb345c07985fcdb35dcfbb36d4aa;p=collection4.git

diff --git a/action_graph.c b/action_graph.c
index b5b3163..a0f257e 100644
--- a/action_graph.c
+++ b/action_graph.c
@@ -19,29 +19,6 @@
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
 
-struct data_source_s
-{
-  char *file;
-  char *name;
-  char *legend;
-  double scale;
-  _Bool nan_to_zero;
-  _Bool draw_area;
-  uint32_t color;
-};
-typedef struct data_source_s data_source_t;
-
-struct graph_def_s
-{
-  data_source_t *data_sources;
-  size_t data_sources_num;
-
-  _Bool stack;
-
-  int def_num;
-};
-typedef struct graph_def_s graph_def_t;
-
 static void emulate_graph (int argc, char **argv) /* {{{ */
 {
   int i;
@@ -110,9 +87,9 @@ int action_graph (void) /* {{{ */
   rrd_info_t *info;
   int status;
 
-  cfg = graph_get_selected ();
+  cfg = gl_graph_get_selected ();
   if (cfg == NULL)
-    OUTPUT_ERROR ("graph_get_selected () failed.\n");
+    OUTPUT_ERROR ("gl_graph_get_selected () failed.\n");
 
   inst = inst_get_selected (cfg);
   if (inst == NULL)
@@ -127,11 +104,11 @@ int action_graph (void) /* {{{ */
   array_append (args, "--imgformat");
   array_append (args, "PNG");
 
-  status = gl_instance_get_rrdargs (cfg, inst, args);
+  status = inst_get_rrdargs (cfg, inst, args);
   if (status != 0)
   {
     array_destroy (args);
-    OUTPUT_ERROR ("gl_instance_get_rrdargs failed with status %i.\n", status);
+    OUTPUT_ERROR ("inst_get_rrdargs failed with status %i.\n", status);
   }
 
   rrd_clear_error ();