mirror of
https://github.com/swaywm/sway.git
synced 2026-04-26 06:46:26 -04:00
221a8b40de
sway commands are implemented using functions that return an error code and (if the function was not successful) an error string. The two are bundled together by the type `struct cmd_results`. This patch alters the command handler prototype so that the cmd_results objects are returned by value (on the stack), instead of by a pointer to a heap allocated instance of a cmd_results. The latter method had the flaw that, if the heap allocation of the cmd_results object failed, the exact return code would be lost. Furthermore, for some command handlers (such as those in sway/commands/output), returning NULL signified success, so an allocation failure could lead to an ignored error. This change prevents both classes of errors.
21 lines
578 B
C
21 lines
578 B
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/config.h"
|
|
#include "sway/commands.h"
|
|
#include "sway/input/input-manager.h"
|
|
#include "util.h"
|
|
|
|
struct cmd_results input_cmd_xkb_capslock(int argc, char **argv) {
|
|
struct cmd_results error;
|
|
if (checkarg(&error, argc, "xkb_capslock", EXPECTED_AT_LEAST, 1)) {
|
|
return error;
|
|
}
|
|
struct input_config *ic = config->handler_context.input_config;
|
|
if (!ic) {
|
|
return cmd_results_new(CMD_FAILURE, "No input device defined.");
|
|
}
|
|
|
|
ic->xkb_capslock = parse_boolean(argv[0], false);
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|