X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_graph_def_json.c;h=2003d2f4c062c5d6b643baeeb9353d97770897a7;hb=c08cfbb86fc765dc9aac1e8f22548aa05da722fc;hp=ea30ad9a38a025ef441220627cd52566a8206479;hpb=f3fc23c1262970dab2779d2a6e5dbc1cc5e89def;p=collection4.git

diff --git a/src/action_graph_def_json.c b/src/action_graph_def_json.c
index ea30ad9..2003d2f 100644
--- a/src/action_graph_def_json.c
+++ b/src/action_graph_def_json.c
@@ -32,7 +32,7 @@
 #include "action_graph_def_json.h"
 #include "common.h"
 #include "graph.h"
-#include "graph_def.h"
+#include "graph_instance.h"
 #include "graph_list.h"
 #include "utils_cgi.h"
 
@@ -51,7 +51,7 @@ static void write_callback (__attribute__((unused)) void *ctx, /* {{{ */
 int action_graph_def_json (void) /* {{{ */
 {
   graph_config_t *cfg;
-  graph_def_t *def;
+  graph_instance_t *inst;
 
   yajl_gen_config handler_config;
   yajl_gen handler;
@@ -64,8 +64,8 @@ int action_graph_def_json (void) /* {{{ */
   if (cfg == NULL)
     return (ENOMEM);
 
-  def = graph_get_defs (cfg);
-  if (def == NULL)
+  inst = inst_get_selected (cfg);
+  if (inst == NULL)
     return (EINVAL);
 
   memset (&handler_config, 0, sizeof (handler_config));
@@ -77,10 +77,7 @@ int action_graph_def_json (void) /* {{{ */
       /* alloc functions = */ NULL,
       /* context = */ NULL);
   if (handler == NULL)
-  {
-    graph_destroy (cfg);
     return (-1);
-  }
 
   printf ("Content-Type: application/json\n");
 
@@ -92,10 +89,8 @@ int action_graph_def_json (void) /* {{{ */
         time_buffer);
   printf ("\n");
 
-  status = def_to_json (def, handler);
+  status = graph_def_to_json (cfg, inst, handler);
 
-  graph_destroy (cfg);
-  def = NULL;
   yajl_gen_free (handler);
 
   return (status);