X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Fecoli_node_re_lex.c;h=a007aba5d56cdee55fb5029887724f8bf10d4fbd;hb=41bf1ba66e15c00f38375d05e49b31aa70f92349;hp=4ebb9fdfe107ee8e5c3e9d3952c4d4f2d39b7ec5;hpb=18d03456d96f7a086a2ccc82ce97fcf056848d90;p=protos%2Flibecoli.git

diff --git a/src/ecoli_node_re_lex.c b/src/ecoli_node_re_lex.c
index 4ebb9fd..a007aba 100644
--- a/src/ecoli_node_re_lex.c
+++ b/src/ecoli_node_re_lex.c
@@ -13,7 +13,7 @@
 #include <ecoli_log.h>
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
-#include <ecoli_keyval.h>
+#include <ecoli_dict.h>
 #include <ecoli_node.h>
 #include <ecoli_complete.h>
 #include <ecoli_parse.h>
@@ -44,7 +44,7 @@ static struct ec_strvec *
 tokenize(struct regexp_pattern *table, size_t table_len, const char *str)
 {
 	struct ec_strvec *strvec = NULL;
-	struct ec_keyval *attrs = NULL;
+	struct ec_dict *attrs = NULL;
 	char *dup = NULL;
 	char c;
 	size_t len, off = 0;
@@ -81,10 +81,10 @@ tokenize(struct regexp_pattern *table, size_t table_len, const char *str)
 				goto fail;
 
 			if (table[i].attr_name != NULL) {
-				attrs = ec_keyval();
+				attrs = ec_dict();
 				if (attrs == NULL)
 					goto fail;
-				if (ec_keyval_set(attrs, table[i].attr_name,
+				if (ec_dict_set(attrs, table[i].attr_name,
 						NULL, NULL) < 0)
 					goto fail;
 				if (ec_strvec_set_attrs(strvec,
@@ -345,6 +345,7 @@ static int ec_node_re_lex_set_config(struct ec_node *gen_node,
 	node->child = ec_node_clone(child->node);
 	for (i = 0; i < (ssize_t)node->len; i++) {
 		ec_free(node->table[i].pattern);
+		ec_free(node->table[i].attr_name);
 		regfree(&node->table[i].r);
 	}
 	ec_free(node->table);