git.droids-corp.org
/
protos
/
libecoli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
duplicate and rename keyval in dict + htable
[protos/libecoli.git]
/
src
/
ecoli_node_re_lex.c
diff --git
a/src/ecoli_node_re_lex.c
b/src/ecoli_node_re_lex.c
index
e7751ac
..
a007aba
100644
(file)
--- 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_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>
#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;
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;
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) {
goto fail;
if (table[i].attr_name != NULL) {
- attrs = ec_
keyval
();
+ attrs = ec_
dict
();
if (attrs == NULL)
goto fail;
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,
NULL, NULL) < 0)
goto fail;
if (ec_strvec_set_attrs(strvec,