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.
28 lines
770 B
C
28 lines
770 B
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "log.h"
|
|
#include "util.h"
|
|
|
|
struct cmd_results bar_cmd_strip_workspace_name(int argc, char **argv) {
|
|
struct cmd_results error;
|
|
if (checkarg(&error, argc,
|
|
"strip_workspace_name", EXPECTED_EQUAL_TO, 1)) {
|
|
return error;
|
|
}
|
|
|
|
config->current_bar->strip_workspace_name =
|
|
parse_boolean(argv[0], config->current_bar->strip_workspace_name);
|
|
|
|
if (config->current_bar->strip_workspace_name) {
|
|
config->current_bar->strip_workspace_numbers = false;
|
|
|
|
sway_log(SWAY_DEBUG, "Stripping workspace name on bar: %s",
|
|
config->current_bar->id);
|
|
} else {
|
|
sway_log(SWAY_DEBUG, "Enabling workspace name on bar: %s",
|
|
config->current_bar->id);
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|