graph_{data,def}_json actions: Don't destroy the graph_config_t object.

[collection4.git] / src / action_graph_def_json.c

diff --git a/src/action_graph_def_json.c b/src/action_graph_def_json.c
index ea30ad9..1ba0678 100644 (file)
--- a/src/action_graph_def_json.c
+++ b/src/action_graph_def_json.c
@@ -32,7 +32,6 @@
 #include "action_graph_def_json.h"
 #include "common.h"
 #include "graph.h"
-#include "graph_def.h"
 #include "graph_list.h"
 #include "utils_cgi.h"
 
@@ -51,7 +50,6 @@ static void write_callback (__attribute__((unused)) void *ctx, /* {{{ */
 int action_graph_def_json (void) /* {{{ */
 {
   graph_config_t *cfg;
-  graph_def_t *def;
 
   yajl_gen_config handler_config;
   yajl_gen handler;
@@ -64,10 +62,6 @@ int action_graph_def_json (void) /* {{{ */
   if (cfg == NULL)
     return (ENOMEM);
 
-  def = graph_get_defs (cfg);
-  if (def == NULL)
-    return (EINVAL);
-
   memset (&handler_config, 0, sizeof (handler_config));
   handler_config.beautify = 1;
   handler_config.indentString = "  ";
@@ -77,10 +71,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 +83,8 @@ int action_graph_def_json (void) /* {{{ */
         time_buffer);
   printf ("\n");
 
-  status = def_to_json (def, handler);
+  status = graph_def_to_json (cfg, handler);
 
-  graph_destroy (cfg);
-  def = NULL;
   yajl_gen_free (handler);
 
   return (status);