X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fecoli_yaml.c;h=8ac47eb84a4a1d83ddbaa1d4ab19816ce02ba7d4;hb=ec731385f1ed38a35e4e0df83e5ae4e8b8151df6;hp=84007d55b96a756ff1d3f8c60b38b1bc908eff62;hpb=18d03456d96f7a086a2ccc82ce97fcf056848d90;p=protos%2Flibecoli.git diff --git a/src/ecoli_yaml.c b/src/ecoli_yaml.c index 84007d5..8ac47eb 100644 --- a/src/ecoli_yaml.c +++ b/src/ecoli_yaml.c @@ -360,6 +360,7 @@ parse_ec_node(struct enode_table *table, const yaml_node_pair_t *pair; const char *key_str, *value_str; struct ec_node *enode = NULL; + char *value_dup = NULL; if (ynode->type != YAML_MAPPING_NODE) { fprintf(stderr, "Ecoli node should be a yaml mapping node\n"); @@ -468,7 +469,24 @@ parse_ec_node(struct enode_table *table, } /* add attributes (all as string) */ - //XXX + if (attrs != NULL) { + for (pair = attrs->data.mapping.pairs.start; + pair < attrs->data.mapping.pairs.top; pair++) { + key = document->nodes.start + pair->key - 1; + value = document->nodes.start + pair->value - 1; + key_str = (const char *)key->data.scalar.value; + value_str = (const char *)value->data.scalar.value; + value_dup = ec_strdup(value_str); + if (value_dup == NULL) + goto fail; + if (ec_keyval_set(ec_node_attrs(enode), key_str, + value_dup, ec_free_func) < 0) { + value_dup = NULL; + goto fail; + } + value_dup = NULL; + } + } return enode; @@ -476,6 +494,7 @@ fail: ec_node_free(enode); ec_config_free(config); ec_free(help); + ec_free(value_dup); return NULL; }