Merge pull request #3403 from mstoeckl/ipcleanup

Remove 'input' field of IPC command return json

1 files changed, 5 insertions, 5 deletions

diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 8fde1776..2aca31dc 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -20,7 +20,7 @@ static enum sway_container_layout parse_layout_string(char *s) {
 	return L_NONE;
 }
 
-static const char* expected_syntax =
+static const char expected_syntax[] =
 	"Expected 'layout default|tabbed|stacking|splitv|splith' or "
 	"'layout toggle [split|all]' or "
 	"'layout toggle [split|tabbed|stacking|splitv|splith] [split|tabbed|stacking|splitv|splith]...'";
@@ -100,14 +100,14 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 		return error;
 	}
 	if (!root->outputs->length) {
-		return cmd_results_new(CMD_INVALID, "layout",
+		return cmd_results_new(CMD_INVALID,
 				"Can't run this command while there's no outputs connected.");
 	}
 	struct sway_container *container = config->handler_context.container;
 	struct sway_workspace *workspace = config->handler_context.workspace;
 
 	if (container && container_is_floating(container)) {
-		return cmd_results_new(CMD_FAILURE, "layout",
+		return cmd_results_new(CMD_FAILURE,
 				"Unable to change layout of floating windows");
 	}
 
@@ -133,7 +133,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 				workspace->layout, workspace->prev_split_layout);
 	}
 	if (new_layout == L_NONE) {
-		return cmd_results_new(CMD_INVALID, "layout", expected_syntax);
+		return cmd_results_new(CMD_INVALID, expected_syntax);
 	}
 	if (new_layout != old_layout) {
 		if (container) {
@@ -152,5 +152,5 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 		arrange_workspace(workspace);
 	}
 
-	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+	return cmd_results_new(CMD_SUCCESS, NULL);
 }