Send proper error messages upon parser failures, use yajl for generating command...

[i3/i3] / include / commands_parser.h

diff --git a/include/commands_parser.h b/include/commands_parser.h
index 5a4472d8acd2b4d090642d5a85a56c919f91e6ca..795cb0265715c44a5d41319a561d161682dc490f 100644 (file)
--- a/include/commands_parser.h
+++ b/include/commands_parser.h
@@ -10,6 +10,8 @@
 #ifndef _COMMANDS_PARSER_H
 #define _COMMANDS_PARSER_H
 
+#include <yajl/yajl_gen.h>
+
 /*
  * Holds the result of a call to any command. When calling
  * parse_command("floating enable, border none"), the parser will internally
@@ -20,8 +22,8 @@
  *
  */
 struct CommandResult {
-    /* The JSON-serialized output of this command. */
-    char *json_output;
+    /* The JSON generator to append a reply to. */
+    yajl_gen json_gen;
 
     /* Whether the command requires calling tree_render. */
     bool needs_tree_render;