Clean up imported bar commands

1 files changed, 23 insertions, 28 deletions

diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 8b3b0aac..17ba9b7c 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -1,47 +1,38 @@
 #include <string.h>
 #include "sway/commands.h"
 
-static struct cmd_results *parse_single_color(char **color, const char *cmd_name, int argc, char **argv) {
+static struct cmd_results *parse_single_color(char **color,
+                const char *cmd_name, int argc, char **argv) {
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
                 return error;
         }
-
-        if (!*color) {
-                *color = malloc(10);
-                if (!*color) {
-                        return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
-                }
+        if (!*color && !(*color = malloc(10))) {
+                return NULL;
         }
-
         error = add_color(cmd_name, *color, argv[0]);
         if (error) {
                 return error;
         }
-
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
-static struct cmd_results *parse_three_colors(char ***colors, const char *cmd_name, int argc, char **argv) {
+static struct cmd_results *parse_three_colors(char ***colors,
+                const char *cmd_name, int argc, char **argv) {
         struct cmd_results *error = NULL;
         if (argc != 3) {
-                return cmd_results_new(CMD_INVALID, cmd_name, "Requires exactly three color values");
+                return cmd_results_new(CMD_INVALID,
+                                cmd_name, "Requires exactly three color values");
         }
-
-        int i;
-        for (i = 0; i < 3; i++) {
-                if (!*colors[i]) {
-                        *(colors[i]) = malloc(10);
-                        if (!*(colors[i])) {
-                                return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
-                        }
+        for (size_t i = 0; i < 3; i++) {
+                if (!*colors[i] && !(*(colors[i]) = malloc(10))) {
+                        return NULL;
                 }
                 error = add_color(cmd_name, *(colors[i]), argv[i]);
                 if (error) {
                         return error;
                 }
         }
-
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
@@ -50,12 +41,10 @@ struct cmd_results *bar_cmd_colors(int argc, char **argv) {
         if ((error = checkarg(argc, "colors", EXPECTED_EQUAL_TO, 1))) {
                 return error;
         }
-
         if (strcmp("{", argv[0]) != 0) {
                 return cmd_results_new(CMD_INVALID, "colors",
                                 "Expected '{' at the start of colors config definition.");
         }
-
         return cmd_results_new(CMD_BLOCK_BAR_COLORS, NULL, NULL);
 }
 
@@ -69,11 +58,13 @@ struct cmd_results *bar_colors_cmd_active_workspace(int argc, char **argv) {
 }
 
 struct cmd_results *bar_colors_cmd_background(int argc, char **argv) {
-        return parse_single_color(&(config->current_bar->colors.background), "background", argc, argv);
+        return parse_single_color(&(config->current_bar->colors.background),
+                        "background", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) {
-        return parse_single_color(&(config->current_bar->colors.focused_background), "focused_background", argc, argv);
+        return parse_single_color(&(config->current_bar->colors.focused_background),
+                        "focused_background", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) {
@@ -104,19 +95,23 @@ struct cmd_results *bar_colors_cmd_inactive_workspace(int argc, char **argv) {
 }
 
 struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) {
-        return parse_single_color(&(config->current_bar->colors.separator), "separator", argc, argv);
+        return parse_single_color(&(config->current_bar->colors.separator),
+                        "separator", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) {
-        return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv);
+        return parse_single_color(&(config->current_bar->colors.focused_separator),
+                        "focused_separator", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) {
-        return parse_single_color(&(config->current_bar->colors.statusline), "statusline", argc, argv);
+        return parse_single_color(&(config->current_bar->colors.statusline),
+                        "statusline", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) {
-        return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv);
+        return parse_single_color(&(config->current_bar->colors.focused_separator),
+                        "focused_separator", argc, argv);
 }
 
 struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) {