EC_LOG_TYPE_REGISTER(config);
-#ifndef EC_COUNT_OF //XXX
-#define EC_COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / \
- ((size_t)(!(sizeof(x) % sizeof(0[x])))))
-#endif
-
static int
__ec_config_dump(FILE *out, const char *key, const struct ec_config *config,
size_t indent);
__ec_config_schema_dump(out, schema, schema_len, 0);
}
+enum ec_config_type ec_config_get_type(const struct ec_config *config)
+{
+ return config->type;
+}
+
struct ec_config *
ec_config_bool(bool boolean)
{
return NULL;
}
-static int
-ec_config_set_schema(struct ec_config *dict,
- const struct ec_config_schema *schema,
- size_t schema_len)
-{
- if (dict->type != EC_CONFIG_TYPE_DICT) {
- errno = EINVAL;
- goto fail;
- }
-
- if (ec_config_schema_validate(schema, schema_len) < 0)
- goto fail;
-
- dict->schema = schema;
- dict->schema_len = schema_len;
-
- return 0;
-
-fail:
- return -1;
-}
-
struct ec_config *
-ec_config_dict(const struct ec_config_schema *schema,
- size_t schema_len)
+ec_config_dict(void)
{
struct ec_config *value = NULL;
struct ec_keyval *dict = NULL;
value->type = EC_CONFIG_TYPE_DICT;
value->dict = dict;
- if (ec_config_set_schema(value, schema, schema_len) < 0)
- goto fail;
-
return value;
fail:
ec_config_cmp(const struct ec_config *value1,
const struct ec_config *value2)
{
+ if (value1 == NULL || value2 == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
+
if (value1->type != value2->type)
return -1;
}
int
-ec_config_validate(const struct ec_config *dict)
+ec_config_validate(const struct ec_config *dict,
+ const struct ec_config_schema *schema,
+ size_t schema_len)
{
- if (dict->type != EC_CONFIG_TYPE_DICT) {
+ if (dict->type != EC_CONFIG_TYPE_DICT || schema == NULL) {
errno = EINVAL;
goto fail;
}
- if (dict->schema == NULL || dict->schema_len == 0) {
- errno = ENOENT;
- goto fail;
- }
- if (ec_config_dict_validate(dict->dict, dict->schema,
- dict->schema_len) < 0)
+ if (ec_config_dict_validate(dict->dict, schema, schema_len) < 0)
goto fail;
return 0
}
struct ec_config *
-ec_config_get(struct ec_config *config, const char *key)
+ec_config_dict_get(const struct ec_config *config, const char *key)
{
- if (config == NULL)
+ if (config == NULL) {
+ errno = EINVAL;
+ return NULL;
+ }
+
+ if (config->type != EC_CONFIG_TYPE_DICT) {
+ errno = EINVAL;
return NULL;
+ }
return ec_keyval_get(config->dict, key);
}
}
/* value is consumed */
-int ec_config_set(struct ec_config *config, const char *key,
+int ec_config_dict_set(struct ec_config *config, const char *key,
struct ec_config *value)
{
void (*free_cb)(struct ec_config *) = ec_config_free;
return -1;
}
+int ec_config_dict_del(struct ec_config *config, const char *key)
+{
+ if (config == NULL || key == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
+ if (config->type != EC_CONFIG_TYPE_DICT) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ return ec_keyval_del(config->dict, key);
+}
+
/* value is consumed */
int
-ec_config_add(struct ec_config *list,
+ec_config_list_add(struct ec_config *list,
struct ec_config *value)
{
- if (list->type != EC_CONFIG_TYPE_LIST) {
+ if (list == NULL || list->type != EC_CONFIG_TYPE_LIST || value == NULL) {
errno = EINVAL;
goto fail;
}
return -1;
}
-void ec_config_del(struct ec_config *list, struct ec_config *config)
+int ec_config_list_del(struct ec_config *list, struct ec_config *config)
{
+ if (list == NULL || list->type != EC_CONFIG_TYPE_LIST) {
+ errno = EINVAL;
+ return -1;
+ }
+
TAILQ_REMOVE(&list->list, config, next);
ec_config_free(config);
+ return 0;
+}
+
+static struct ec_config *
+ec_config_list_dup(const struct ec_config_list *list)
+{
+ struct ec_config *dup = NULL, *v, *value;
+
+ dup = ec_config_list();
+ if (dup == NULL)
+ goto fail;
+
+ TAILQ_FOREACH(v, list, next) {
+ value = ec_config_dup(v);
+ if (value == NULL)
+ goto fail;
+ if (ec_config_list_add(dup, value) < 0)
+ goto fail;
+ }
+
+ return dup;
+
+fail:
+ ec_config_free(dup);
+ return NULL;
+}
+
+static struct ec_config *
+ec_config_dict_dup(const struct ec_keyval *dict)
+{
+ struct ec_config *dup = NULL, *value;
+ struct ec_keyval_iter *iter = NULL;
+ const char *key;
+
+ dup = ec_config_dict();
+ if (dup == NULL)
+ goto fail;
+
+ for (iter = ec_keyval_iter(dict);
+ ec_keyval_iter_valid(iter);
+ ec_keyval_iter_next(iter)) {
+ key = ec_keyval_iter_get_key(iter);
+ value = ec_config_dup(ec_keyval_iter_get_val(iter));
+ if (value == NULL)
+ goto fail;
+ if (ec_config_dict_set(dup, key, value) < 0)
+ goto fail;
+ }
+ ec_keyval_iter_free(iter);
+
+ return dup;
+
+fail:
+ ec_config_free(dup);
+ ec_keyval_iter_free(iter);
+ return NULL;
+}
+
+struct ec_config *
+ec_config_dup(const struct ec_config *config)
+{
+ if (config == NULL) {
+ errno = EINVAL;
+ return NULL;
+ }
+
+ switch (config->type) {
+ case EC_CONFIG_TYPE_BOOL:
+ return ec_config_bool(config->boolean);
+ case EC_CONFIG_TYPE_INT64:
+ return ec_config_i64(config->i64);
+ case EC_CONFIG_TYPE_UINT64:
+ return ec_config_u64(config->u64);
+ case EC_CONFIG_TYPE_STRING:
+ return ec_config_string(config->string);
+ case EC_CONFIG_TYPE_NODE:
+ return ec_config_node(ec_node_clone(config->node));
+ case EC_CONFIG_TYPE_LIST:
+ return ec_config_list_dup(&config->list);
+ case EC_CONFIG_TYPE_DICT:
+ return ec_config_dict_dup(config->dict);
+ default:
+ errno = EINVAL;
+ break;
+ }
+
+ return NULL;
}
static int
struct ec_node *node = NULL;
struct ec_keyval *dict = NULL;
const struct ec_config *value = NULL;
- struct ec_config *config = NULL, *list = NULL, *subconfig = NULL;
+ struct ec_config *config = NULL, *config2 = NULL;
+ struct ec_config *list = NULL, *subconfig = NULL;
struct ec_config *list_, *config_;
int testres = 0;
int ret;
ec_config_schema_dump(stdout, sch_baseconfig,
EC_COUNT_OF(sch_baseconfig));
- config = ec_config_dict(sch_baseconfig, EC_COUNT_OF(sch_baseconfig));
+ config = ec_config_dict();
if (config == NULL)
goto fail;
- ret = ec_config_set(config, "my_bool", ec_config_bool(true));
+ ret = ec_config_dict_set(config, "my_bool", ec_config_bool(true));
testres |= EC_TEST_CHECK(ret == 0, "cannot set boolean");
- value = ec_config_get(config, "my_bool");
+ value = ec_config_dict_get(config, "my_bool");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_BOOL &&
value->boolean == true,
"unexpected boolean value");
- ret = ec_config_set(config, "my_int", ec_config_i64(1234));
+ ret = ec_config_dict_set(config, "my_int", ec_config_i64(1234));
testres |= EC_TEST_CHECK(ret == 0, "cannot set int");
- value = ec_config_get(config, "my_int");
+ value = ec_config_dict_get(config, "my_int");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_INT64 &&
"unexpected int value");
testres |= EC_TEST_CHECK(
- ec_config_validate(config) == 0,
+ ec_config_validate(config, sch_baseconfig,
+ EC_COUNT_OF(sch_baseconfig)) == 0,
"cannot validate config\n");
- ret = ec_config_set(config, "my_string", ec_config_string("toto"));
+ ret = ec_config_dict_set(config, "my_string", ec_config_string("toto"));
testres |= EC_TEST_CHECK(ret == 0, "cannot set string");
- value = ec_config_get(config, "my_string");
+ value = ec_config_dict_get(config, "my_string");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_STRING &&
if (list == NULL)
goto fail;
- subconfig = ec_config_dict(sch_dict, EC_COUNT_OF(sch_dict));
+ subconfig = ec_config_dict();
if (subconfig == NULL)
goto fail;
- ret = ec_config_set(subconfig, "my_int", ec_config_i64(1));
+ ret = ec_config_dict_set(subconfig, "my_int", ec_config_i64(1));
testres |= EC_TEST_CHECK(ret == 0, "cannot set int");
- value = ec_config_get(subconfig, "my_int");
+ value = ec_config_dict_get(subconfig, "my_int");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_INT64 &&
value->i64 == 1,
"unexpected int value");
- ret = ec_config_set(subconfig, "my_int2", ec_config_i64(2));
+ ret = ec_config_dict_set(subconfig, "my_int2", ec_config_i64(2));
testres |= EC_TEST_CHECK(ret == 0, "cannot set int");
- value = ec_config_get(subconfig, "my_int2");
+ value = ec_config_dict_get(subconfig, "my_int2");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_INT64 &&
"unexpected int value");
testres |= EC_TEST_CHECK(
- ec_config_validate(subconfig) == 0,
+ ec_config_validate(subconfig, sch_dict,
+ EC_COUNT_OF(sch_dict)) == 0,
"cannot validate subconfig\n");
- ret = ec_config_add(list, subconfig);
+ ret = ec_config_list_add(list, subconfig);
subconfig = NULL; /* freed */
testres |= EC_TEST_CHECK(ret == 0, "cannot add in list");
- subconfig = ec_config_dict(sch_dict, EC_COUNT_OF(sch_dict));
+ subconfig = ec_config_dict();
if (subconfig == NULL)
goto fail;
- ret = ec_config_set(subconfig, "my_int", ec_config_i64(3));
+ ret = ec_config_dict_set(subconfig, "my_int", ec_config_i64(3));
testres |= EC_TEST_CHECK(ret == 0, "cannot set int");
- value = ec_config_get(subconfig, "my_int");
+ value = ec_config_dict_get(subconfig, "my_int");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_INT64 &&
value->i64 == 3,
"unexpected int value");
- ret = ec_config_set(subconfig, "my_int2", ec_config_i64(4));
+ ret = ec_config_dict_set(subconfig, "my_int2", ec_config_i64(4));
testres |= EC_TEST_CHECK(ret == 0, "cannot set int");
- value = ec_config_get(subconfig, "my_int2");
+ value = ec_config_dict_get(subconfig, "my_int2");
testres |= EC_TEST_CHECK(
value != NULL &&
value->type == EC_CONFIG_TYPE_INT64 &&
"unexpected int value");
testres |= EC_TEST_CHECK(
- ec_config_validate(subconfig) == 0,
+ ec_config_validate(subconfig, sch_dict,
+ EC_COUNT_OF(sch_dict)) == 0,
"cannot validate subconfig\n");
- ret = ec_config_add(list, subconfig);
+ ret = ec_config_list_add(list, subconfig);
subconfig = NULL; /* freed */
testres |= EC_TEST_CHECK(ret == 0, "cannot add in list");
- ret = ec_config_set(config, "my_dictlist", list);
+ ret = ec_config_dict_set(config, "my_dictlist", list);
list = NULL;
testres |= EC_TEST_CHECK(ret == 0, "cannot set list");
testres |= EC_TEST_CHECK(
- ec_config_validate(config) == 0,
+ ec_config_validate(config, sch_baseconfig,
+ EC_COUNT_OF(sch_baseconfig)) == 0,
"cannot validate config\n");
- list_ = ec_config_get(config, "my_dictlist");
- printf("list = %p\n", list_);
+ list_ = ec_config_dict_get(config, "my_dictlist");
for (config_ = ec_config_list_first(list_); config_ != NULL;
config_ = ec_config_list_next(list_, config_)) {
ec_config_dump(stdout, config_);
ec_config_dump(stdout, config);
- /* remove the first element */
- ec_config_del(list_, ec_config_list_first(list_));
- testres |= EC_TEST_CHECK(
- ec_config_validate(config) == 0,
- "cannot validate config\n");
-
-#if 0
- value.type = EC_CONFIG_TYPE_NODE;
- value.node = ec_node_clone(node);
- ret = ec_config_set(config, "node", value);
- testres |= EC_TEST_CHECK(ret == 0, "cannot set node");
- pvalue = ec_config_get(config, "node");
- testres |= EC_TEST_CHECK(
- pvalue != NULL &&
- ec_config_cmp(pvalue, &value) == 0,
- "unexpected node value");
-
- subconfig = ec_config(dict, EC_COUNT_OF(dict));
- if (subconfig == NULL)
- goto fail;
-
- value.type = EC_CONFIG_TYPE_INT64;
- value.i64 = 4321;
- ret = ec_config_set(subconfig, "int", value);
- testres |= EC_TEST_CHECK(ret == 0, "cannot set int");
- pvalue = ec_config_get(subconfig, "int");
+ config2 = ec_config_dup(config);
+ testres |= EC_TEST_CHECK(config2 != NULL, "cannot duplicate config");
testres |= EC_TEST_CHECK(
- pvalue != NULL &&
- ec_config_cmp(pvalue, &value) == 0,
- "unexpected int value");
+ ec_config_cmp(config, config2) == 0,
+ "fail to compare config");
+ ec_config_free(config2);
+ config2 = NULL;
- value.type = EC_CONFIG_TYPE_DICT;
- value.dict = subconfig;
- subconfig = NULL; /* will be freed when freeing config */
- ret = ec_config_set(config, "dict", value);
- testres |= EC_TEST_CHECK(ret == 0, "cannot set dict");
- pvalue = ec_config_get(config, "dict");
- testres |= EC_TEST_CHECK(
- pvalue != NULL &&
- ec_config_cmp(pvalue, &value) == 0,
- "unexpected dict value");
-
- value.type = EC_CONFIG_TYPE_INT64;
- value.i64 = 4321;
- pvalue = ec_config_get(
- ec_config_get(config, "dict")->dict, "int");
+ /* remove the first element */
+ ec_config_list_del(list_, ec_config_list_first(list_));
testres |= EC_TEST_CHECK(
- pvalue != NULL &&
- ec_config_cmp(pvalue, &value) == 0,
- "unexpected int value");
+ ec_config_validate(config, sch_baseconfig,
+ EC_COUNT_OF(sch_baseconfig)) == 0,
+ "cannot validate config\n");
- value.type = EC_CONFIG_TYPE_INT64;
- value.i64 = 1;
- ret = ec_config_add(config, "intlist", value);
- testres |= EC_TEST_CHECK(ret == 0, "cannot add int in list");
- value.type = EC_CONFIG_TYPE_INT64;
- value.i64 = 2;
- ret = ec_config_add(config, "intlist", value);
- testres |= EC_TEST_CHECK(ret == 0, "cannot add int in list");
- value.type = EC_CONFIG_TYPE_INT64;
- value.i64 = 3;
- ret = ec_config_add(config, "intlist", value);
- testres |= EC_TEST_CHECK(ret == 0, "cannot add int in list");
-
- value.type = EC_CONFIG_TYPE_INT64;
- value.i64 = 4321;
- ret = ec_config_set(config, "invalid", value);
- testres |= EC_TEST_CHECK(ret < 0,
- "should not be able to set invalid key");
- pvalue = ec_config_get(config, "invalid");
- testres |= EC_TEST_CHECK(pvalue == NULL,
- "invalid key returned a value");
-
-#endif
ec_config_dump(stdout, config);
ec_config_free(list);
ec_config_free(list);
ec_config_free(subconfig);
ec_config_free(config);
+ ec_config_free(config2);
ec_keyval_free(dict);
ec_node_free(node);
git.droids-corp.org / protos / libecoli.git / blobdiff