aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/output/position.c
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-01-14 11:44:18 -0500
committerGitHub <noreply@github.com>2019-01-14 11:44:18 -0500
commit15cd8b6a86295a445a1037afd0028b1226a14c82 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/output/position.c
parent64ef9366733d6d332a24897f72eba90ba2adca1e (diff)
parent2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (diff)
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/output/position.c')
-rw-r--r--sway/commands/output/position.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/sway/commands/output/position.c b/sway/commands/output/position.c
index 449767b1..689462cb 100644
--- a/sway/commands/output/position.c
+++ b/sway/commands/output/position.c
@@ -4,11 +4,10 @@
struct cmd_results *output_cmd_position(int argc, char **argv) {
if (!config->handler_context.output_config) {
- return cmd_results_new(CMD_FAILURE, "output", "Missing output config");
+ return cmd_results_new(CMD_FAILURE, "Missing output config");
}
if (!argc) {
- return cmd_results_new(CMD_INVALID, "output",
- "Missing position argument.");
+ return cmd_results_new(CMD_INVALID, "Missing position argument.");
}
char *end;
@@ -16,26 +15,22 @@ struct cmd_results *output_cmd_position(int argc, char **argv) {
if (*end) {
// Format is 1234,4321
if (*end != ',') {
- return cmd_results_new(CMD_INVALID, "output",
- "Invalid position x.");
+ return cmd_results_new(CMD_INVALID, "Invalid position x.");
}
++end;
config->handler_context.output_config->y = strtol(end, &end, 10);
if (*end) {
- return cmd_results_new(CMD_INVALID, "output",
- "Invalid position y.");
+ return cmd_results_new(CMD_INVALID, "Invalid position y.");
}
} else {
// Format is 1234 4321 (legacy)
argc--; argv++;
if (!argc) {
- return cmd_results_new(CMD_INVALID, "output",
- "Missing position argument (y).");
+ return cmd_results_new(CMD_INVALID, "Missing position argument (y).");
}
config->handler_context.output_config->y = strtol(*argv, &end, 10);
if (*end) {
- return cmd_results_new(CMD_INVALID, "output",
- "Invalid position y.");
+ return cmd_results_new(CMD_INVALID, "Invalid position y.");
}
}