From ce6be7afd4d10b542f9cce8634d6bdd81754f775 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 18 Mar 2019 11:58:40 +0000
Subject: Make array options a sparse tree instead of an array of char * and
 remove the size limit.

---
 cmd-set-option.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'cmd-set-option.c')

diff --git a/cmd-set-option.c b/cmd-set-option.c
index a55472ca..ddbfc334 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -163,11 +163,9 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 	parent = options_get(oo, name);
 
 	/* Check that array options and indexes match up. */
-	if (idx != -1) {
-		if (*name == '@' || options_array_size(parent, NULL) == -1) {
-			cmdq_error(item, "not an array: %s", argument);
-			goto fail;
-		}
+	if (idx != -1 && (*name == '@' || !options_isarray(parent))) {
+		cmdq_error(item, "not an array: %s", argument);
+		goto fail;
 	}
 
 	/* With -o, check this option is not already set. */
@@ -209,7 +207,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 			goto fail;
 		}
 		options_set_string(oo, name, append, "%s", value);
-	} else if (idx == -1 && options_array_size(parent, NULL) == -1) {
+	} else if (idx == -1 && !options_isarray(parent)) {
 		error = cmd_set_option_set(self, item, oo, parent, value);
 		if (error != 0)
 			goto fail;
-- 
cgit v1.2.3