projects
/
collection4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8db49fe
)
graph_def_json action: Use "graph_def_to_json" rather than "def_to_json".
author
Florian Forster
<octo@verplant.org>
Wed, 8 Sep 2010 09:26:39 +0000
(11:26 +0200)
committer
Florian Forster
<octo@verplant.org>
Wed, 8 Sep 2010 09:26:39 +0000
(11:26 +0200)
src/action_graph_def_json.c
patch
|
blob
|
history
diff --git
a/src/action_graph_def_json.c
b/src/action_graph_def_json.c
index
ea30ad9
..
684ad7a
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 "action_graph_def_json.h"
#include "common.h"
#include "graph.h"
-#include "graph_def.h"
#include "graph_list.h"
#include "utils_cgi.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;
int action_graph_def_json (void) /* {{{ */
{
graph_config_t *cfg;
- graph_def_t *def;
yajl_gen_config handler_config;
yajl_gen handler;
yajl_gen_config handler_config;
yajl_gen handler;
@@
-64,10
+62,6
@@
int action_graph_def_json (void) /* {{{ */
if (cfg == NULL)
return (ENOMEM);
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 = " ";
memset (&handler_config, 0, sizeof (handler_config));
handler_config.beautify = 1;
handler_config.indentString = " ";
@@
-92,10
+86,9
@@
int action_graph_def_json (void) /* {{{ */
time_buffer);
printf ("\n");
time_buffer);
printf ("\n");
- status =
def_to_json (def
, handler);
+ status =
graph_def_to_json (cfg
, handler);
graph_destroy (cfg);
graph_destroy (cfg);
- def = NULL;
yajl_gen_free (handler);
return (status);
yajl_gen_free (handler);
return (status);