Change the names of parser result structs

[i3/i3] / include / commands_parser.h

diff --git a/include/commands_parser.h b/include/commands_parser.h
index fcc14ff58881f3ffbfb1096d9ff7b02afa673061..8c733db4f0f4433429725cc51df81b14516ae498 100644 (file)
--- a/include/commands_parser.h
+++ b/include/commands_parser.h
@@ -7,33 +7,26 @@
  * commands.c: all command functions (see commands_parser.c)
  *
  */
-#ifndef I3_COMMANDS_PARSER_H
-#define I3_COMMANDS_PARSER_H
+#pragma once
 
 #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
- * use a struct CommandResult when calling cmd_floating and cmd_border.
- * parse_command will also return another struct CommandResult, whose
- * json_output is set to a map of individual json_outputs and whose
- * needs_tree_trender is true if any individual needs_tree_render was true.
- *
+ * Holds an intermediate represenation of the result of a call to any command.
+ * When calling parse_command("floating enable, border none"), the parser will
+ * internally use this struct when calling cmd_floating and cmd_border.
  */
-struct CommandResult {
+struct CommandResultIR {
     /* The JSON generator to append a reply to. */
     yajl_gen json_gen;
 
-    /* Whether the command requires calling tree_render. */
-    bool needs_tree_render;
-
     /* The next state to transition to. Passed to the function so that we can
      * determine the next state as a result of a function call, like
      * cfg_criteria_pop_state() does. */
     int next_state;
-};
 
-struct CommandResult *parse_command(const char *input);
+    /* Whether the command requires calling tree_render. */
+    bool needs_tree_render;
+};
 
-#endif
+struct CommandResultIR *parse_command(const char *input);