cmd_bar: simplify logic

sway/commands/bar.c

@@ -46,15 +46,13 @@ static bool is_subcommand(char *name) {
 
 struct cmd_results *cmd_bar(int argc, char **argv) {
 	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "bar", EXPECTED_AT_LEAST, 1))) {
+	if ((error = checkarg(argc, "bar", EXPECTED_AT_LEAST, 2))) {
 		return error;
 	}
 
 	bool spawn = false;
-	if (argc > 1) {
 	struct bar_config *bar = NULL;
-		if (!is_subcommand(argv[0]) ||
+	if (strcmp(argv[0], "id") != 0 && is_subcommand(argv[1])) {
-				(strcmp(argv[0], "id") != 0 && is_subcommand(argv[1]))) {
 		for (int i = 0; i < config->bars->length; ++i) {
 			struct bar_config *item = config->bars->items[i];
 			if (strcmp(item->id, argv[0]) == 0) {
@@ -77,7 +75,6 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
 		config->current_bar = bar;
 		++argv; --argc;
 	}
-	}
 
 	if (!config->current_bar && config->reading) {
 		// Create new bar with default values
@@ -88,19 +85,14 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
 		}
 
 		// set bar id
-		for (int i = 0; i < config->bars->length; ++i) {
+		const int len = 5 + numlen(config->bars->length - 1); // "bar-"+i+\0
-			if (bar == config->bars->items[i]) {
-				const int len = 5 + numlen(i); // "bar-" + i + \0
 		bar->id = malloc(len * sizeof(char));
 		if (bar->id) {
-					snprintf(bar->id, len, "bar-%d", i);
+			snprintf(bar->id, len, "bar-%d", config->bars->length - 1);
 		} else {
 			return cmd_results_new(CMD_FAILURE,
 					"bar", "Unable to allocate bar ID");
 		}
-				break;
-			}
-		}
 
 		// Set current bar
 		config->current_bar = bar;