1 files changed, 4 insertions, 5 deletions

diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index d42b7fc2..22756acb 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -8,7 +8,7 @@
 #include "log.h"
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_handlers[] = {
+static const struct cmd_handler bar_handlers[] = {
         { "bindcode", bar_cmd_bindcode },
         { "binding_mode_indicator", bar_cmd_binding_mode_indicator },
         { "bindsym", bar_cmd_bindsym },
@@ -41,7 +41,7 @@ static struct cmd_handler bar_handlers[] = {
 };
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_config_handlers[] = {
+static const struct cmd_handler bar_config_handlers[] = {
         { "id", bar_cmd_id },
         { "swaybar_command", bar_cmd_swaybar_command },
 };
@@ -73,12 +73,10 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
                 }
                 ++argv; --argc;
         } else if (config->reading && !config->current_bar) {
-                int len = snprintf(NULL, 0, "bar-%d", config->bars->length) + 1;
-                id = malloc(len * sizeof(char));
+                id = format_str("bar-%d", config->bars->length);
                 if (!id) {
                         return cmd_results_new(CMD_FAILURE, "Unable to allocate bar id");
                 }
-                snprintf(id, len, "bar-%d", config->bars->length);
         } else if (!config->reading && strcmp(argv[0], "mode") != 0 &&
                         strcmp(argv[0], "hidden_state") != 0) {
                 if (is_subcommand(argv[0])) {
@@ -116,6 +114,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
         if (res && res->status != CMD_SUCCESS) {
                 if (id) {
                         free_bar_config(config->current_bar);
+                        config->current_bar = NULL;
                         id = NULL;
                 }
                 return res;