projects
/
collection4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
share/collection.js: Keep visibility when redrawing graphs.
[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
684ad7a
..
2003d2f
100644
(file)
--- a/
src/action_graph_def_json.c
+++ b/
src/action_graph_def_json.c
@@
-32,6
+32,7
@@
#include "action_graph_def_json.h"
#include "common.h"
#include "graph.h"
#include "action_graph_def_json.h"
#include "common.h"
#include "graph.h"
+#include "graph_instance.h"
#include "graph_list.h"
#include "utils_cgi.h"
#include "graph_list.h"
#include "utils_cgi.h"
@@
-50,6
+51,7
@@
static void write_callback (__attribute__((unused)) void *ctx, /* {{{ */
int action_graph_def_json (void) /* {{{ */
{
graph_config_t *cfg;
int action_graph_def_json (void) /* {{{ */
{
graph_config_t *cfg;
+ graph_instance_t *inst;
yajl_gen_config handler_config;
yajl_gen handler;
yajl_gen_config handler_config;
yajl_gen handler;
@@
-62,6
+64,10
@@
int action_graph_def_json (void) /* {{{ */
if (cfg == NULL)
return (ENOMEM);
if (cfg == NULL)
return (ENOMEM);
+ inst = inst_get_selected (cfg);
+ if (inst == NULL)
+ return (EINVAL);
+
memset (&handler_config, 0, sizeof (handler_config));
handler_config.beautify = 1;
handler_config.indentString = " ";
memset (&handler_config, 0, sizeof (handler_config));
handler_config.beautify = 1;
handler_config.indentString = " ";
@@
-71,10
+77,7
@@
int action_graph_def_json (void) /* {{{ */
/* alloc functions = */ NULL,
/* context = */ NULL);
if (handler == NULL)
/* alloc functions = */ NULL,
/* context = */ NULL);
if (handler == NULL)
- {
- graph_destroy (cfg);
return (-1);
return (-1);
- }
printf ("Content-Type: application/json\n");
printf ("Content-Type: application/json\n");
@@
-86,9
+89,8
@@
int action_graph_def_json (void) /* {{{ */
time_buffer);
printf ("\n");
time_buffer);
printf ("\n");
- status = graph_def_to_json (cfg, handler);
+ status = graph_def_to_json (cfg,
inst,
handler);
- graph_destroy (cfg);
yajl_gen_free (handler);
return (status);
yajl_gen_free (handler);
return (status);