Merge branch 'next'

[i3/i3] / include / config_parser.h

diff --git a/include/config_parser.h b/include/config_parser.h
index 6f1b5315af5e0b98989609844dbb14536560e711..9fc3bf2ffb5ea63e2b3e22bef34a69f9472dd9d5 100644 (file)
--- a/include/config_parser.h
+++ b/include/config_parser.h
@@ -14,11 +14,12 @@
 extern pid_t config_error_nagbar_pid;
 
 /*
- * The result of a parse_config call. Currently unused, but the JSON output
- * will be useful in the future when we implement a config parsing IPC command.
+ * An intermediate reprsentation of the result of a parse_config call.
+ * Currently unused, but the JSON output will be useful in the future when we
+ * implement a config parsing IPC command.
  *
  */
-struct ConfigResult {
+struct ConfigResultIR {
     /* The JSON generator to append a reply to. */
     yajl_gen json_gen;
 
@@ -28,11 +29,14 @@ struct ConfigResult {
     int next_state;
 };
 
-struct ConfigResult *parse_config(const char *input, struct context *context);
+struct ConfigResultIR *parse_config(const char *input, struct context *context);
 
 /**
  * Parses the given file by first replacing the variables, then calling
- * parse_config and possibly launching i3-nagbar.
+ * parse_config and launching i3-nagbar if use_nagbar is true.
+ *
+ * The return value is a boolean indicating whether there were errors during
+ * parsing.
  *
  */
-void parse_file(const char *f);
+bool parse_file(const char *f, bool use_nagbar);