X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Fecoli_editline.c;h=e3e53cfd10dc837b8934e3d28ab94b444f388164;hb=331d87b8f34493ea7eb4db75fa9d90b2e3ed503b;hp=6a6e23b0ec6e8415b4084b19e1af92225448974d;hpb=984760622f2c8472fd2667e24bcceb543bdb1aff;p=protos%2Flibecoli.git

diff --git a/src/ecoli_editline.c b/src/ecoli_editline.c
index 6a6e23b..e3e53cf 100644
--- a/src/ecoli_editline.c
+++ b/src/ecoli_editline.c
@@ -311,16 +311,11 @@ void ec_editline_free_completions(char **matches, size_t len)
 ssize_t
 ec_editline_get_completions(const struct ec_comp *cmpl, char ***matches_out)
 {
-	const struct ec_comp_item *item;
-	struct ec_comp_iter *iter = NULL;
+	struct ec_comp_item *item;
 	char **matches = NULL;
 	size_t count = 0;
 
-	iter = ec_comp_iter(cmpl, EC_COMP_FULL | EC_COMP_PARTIAL);
-	if (iter == NULL)
-		goto fail;
-
-	while ((item = ec_comp_iter_next(iter)) != NULL) {
+	EC_COMP_FOREACH(item, cmpl, EC_COMP_FULL | EC_COMP_PARTIAL) {
 		char **tmp;
 
 		tmp = realloc(matches, (count + 1) * sizeof(char *));
@@ -339,24 +334,18 @@ ec_editline_get_completions(const struct ec_comp *cmpl, char ***matches_out)
 fail:
 	ec_editline_free_completions(matches, count);
 	*matches_out = NULL;
-	ec_comp_iter_free(iter);
 	return -1;
 }
 
 char *
 ec_editline_append_chars(const struct ec_comp *cmpl)
 {
-	const struct ec_comp_item *item;
-	struct ec_comp_iter *iter = NULL;
+	struct ec_comp_item *item;
 	const char *append;
 	char *ret = NULL;
 	size_t n;
 
-	iter = ec_comp_iter(cmpl, EC_COMP_FULL | EC_COMP_PARTIAL);
-	if (iter == NULL)
-		goto fail;
-
-	while ((item = ec_comp_iter_next(iter)) != NULL) {
+	EC_COMP_FOREACH(item, cmpl, EC_COMP_FULL | EC_COMP_PARTIAL) {
 		append = ec_comp_item_get_completion(item);
 		if (ret == NULL) {
 			ret = ec_strdup(append);
@@ -367,12 +356,10 @@ ec_editline_append_chars(const struct ec_comp *cmpl)
 			ret[n] = '\0';
 		}
 	}
-	ec_comp_iter_free(iter);
 
 	return ret;
 
 fail:
-	ec_comp_iter_free(iter);
 	ec_free(ret);
 
 	return NULL;
@@ -383,34 +370,34 @@ static int get_node_help(const struct ec_comp_item *item,
 			struct ec_editline_help *help)
 {
 	const struct ec_comp_group *grp;
-	const struct ec_pnode *state;
+	const struct ec_pnode *pstate;
 	const struct ec_node *node;
 	const char *node_help = NULL;
-	const char *node_desc = NULL;
+	char *node_desc = NULL;
 
 	help->desc = NULL;
 	help->help = NULL;
 
 	grp = ec_comp_item_get_grp(item);
 
-	for (state = ec_comp_group_get_state(grp); state != NULL;
-	     state = ec_pnode_get_parent(state)) {
-		node = ec_pnode_get_node(state);
+	for (pstate = ec_comp_group_get_pstate(grp); pstate != NULL;
+	     pstate = ec_pnode_get_parent(pstate)) {
+		node = ec_pnode_get_node(pstate);
 		if (node_help == NULL)
 			node_help = ec_dict_get(ec_node_attrs(node), "help");
-		if (node_desc == NULL)
+		if (node_desc == NULL) {
 			node_desc = ec_node_desc(node);
+			if (node_desc == NULL)
+				goto fail;
+		}
 	}
 
-	if (node_help == NULL)
-		node_help = "";
 	if (node_desc == NULL)
 		goto fail;
+	if (node_help == NULL)
+		node_help = "";
 
-	help->desc = ec_strdup(node_desc);
-	if (help->desc == NULL)
-		goto fail;
-
+	help->desc = node_desc;
 	help->help = ec_strdup(node_help);
 	if (help->help == NULL)
 		goto fail;
@@ -418,6 +405,7 @@ static int get_node_help(const struct ec_comp_item *item,
 	return 0;
 
 fail:
+	ec_free(node_desc);
 	ec_free(help->desc);
 	ec_free(help->help);
 	return -1;
@@ -427,9 +415,8 @@ ssize_t
 ec_editline_get_helps(const struct ec_editline *editline, const char *line,
 	const char *full_line, struct ec_editline_help **helps_out)
 {
-	struct ec_comp_iter *iter = NULL;
 	const struct ec_comp_group *grp, *prev_grp = NULL;
-	const struct ec_comp_item *item;
+	struct ec_comp_item *item;
 	struct ec_comp *cmpl = NULL;
 	struct ec_pnode *parse = NULL;
 	unsigned int count = 0;
@@ -449,12 +436,6 @@ ec_editline_get_helps(const struct ec_editline *editline, const char *line,
 	if (cmpl == NULL) //XXX log error
 		goto fail;
 
-	/* let's display one contextual help per node */
-	iter = ec_comp_iter(cmpl,
-		EC_COMP_UNKNOWN | EC_COMP_FULL | EC_COMP_PARTIAL);
-	if (iter == NULL)
-		goto fail;
-
 	helps = ec_calloc(1, sizeof(*helps));
 	if (helps == NULL)
 		goto fail;
@@ -467,7 +448,9 @@ ec_editline_get_helps(const struct ec_editline *editline, const char *line,
 			goto fail;
 	}
 
-	while ((item = ec_comp_iter_next(iter)) != NULL) {
+	/* let's display one contextual help per node */
+	EC_COMP_FOREACH(item, cmpl,
+			EC_COMP_UNKNOWN | EC_COMP_FULL | EC_COMP_PARTIAL) {
 		struct ec_editline_help *tmp = NULL;
 
 		/* keep one help per group, skip other items  */
@@ -486,14 +469,12 @@ ec_editline_get_helps(const struct ec_editline *editline, const char *line,
 		count++;
 	}
 
-	ec_comp_iter_free(iter);
 	ec_comp_free(cmpl);
 	*helps_out = helps;
 
 	return count;
 
 fail:
-	ec_comp_iter_free(iter);
 	ec_pnode_free(parse);
 	ec_comp_free(cmpl);
 	if (helps != NULL) {