export schema lookup

diff --git a/lib/ecoli_config.c b/lib/ecoli_config.c
index ff4b27d10d63aeb9ba747c323a26a5b4325769c0..63b572555c28ca6cfd071f7e75bff1d97e328b3e 100644 (file)
--- a/lib/ecoli_config.c
+++ b/lib/ecoli_config.c
@@ -360,15 +360,14 @@ ec_config_list(void)
        return value;
 }
 
-static const struct ec_config_schema *
+const struct ec_config_schema *
 ec_config_schema_lookup(const struct ec_config_schema *schema,
-                       const char *key, enum ec_config_type type)
+                       const char *key)
 {
        size_t i;
 
        for (i = 0; schema[i].type != EC_CONFIG_TYPE_NONE; i++) {
-               if (!strcmp(key, schema[i].key) &&
-                               type == schema[i].type)
+               if (!strcmp(key, schema[i].key))
                        return &schema[i];
        }
 
@@ -536,12 +535,11 @@ ec_config_dict_validate(const struct ec_keyval *dict,
 
                key = ec_keyval_iter_get_key(iter);
                value = ec_keyval_iter_get_val(iter);
-               sch = ec_config_schema_lookup(schema, key, value->type);
-               if (sch == NULL) {
+               sch = ec_config_schema_lookup(schema, key);
+               if (sch == NULL || sch->type != value->type) {
                        errno = EBADMSG;
                        goto fail;
                }
-
                if (value->type == EC_CONFIG_TYPE_LIST) {
                        if (ec_config_list_validate(&value->list,
                                                        sch->subschema) < 0)

diff --git a/lib/ecoli_config.h b/lib/ecoli_config.h
index 8ceddf55f238937c2749baaf93ffa6efc8414d1e..706af79f398d5b26b81c9da14c613facdc705c80 100644 (file)
--- a/lib/ecoli_config.h
+++ b/lib/ecoli_config.h
@@ -98,6 +98,21 @@ int ec_config_schema_validate(const struct ec_config_schema *schema);
  */
 void ec_config_schema_dump(FILE *out, const struct ec_config_schema *schema);
 
+/**
+ * Find a schema entry matching the key.
+ *
+ * Browse the schema array and lookup for the given key.
+ *
+ * @param schema
+ *   Pointer to the first element of the schema array. The array
+ *   must be terminated by a sentinel entry (type == EC_CONFIG_TYPE_NONE).
+ * @return
+ *   The schema entry if it matches a key, or NULL if not found.
+ */
+const struct ec_config_schema *
+ec_config_schema_lookup(const struct ec_config_schema *schema,
+                       const char *key);
+
 /**
  * Check if a key name is reserved in a config dict.
  *