aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-07-05 02:13:15 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2015-07-05 02:16:43 +0200
commit34c1df5171a911ae1ffcaa7a796204eab2573359 (patch)
treea93aab99f0ca982f4f809f413e54d2c1ff3ce40f
parentb1dd34a7ba1d7558763fcf1f1528d34fc1856829 (diff)
downloadxK-34c1df5171a911ae1ffcaa7a796204eab2573359.tar.gz
xK-34c1df5171a911ae1ffcaa7a796204eab2573359.tar.xz
xK-34c1df5171a911ae1ffcaa7a796204eab2573359.zip
mv config_schema_{fix_value,initialize_item}()
-rw-r--r--common.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common.c b/common.c
index 52245b7..b116266 100644
--- a/common.c
+++ b/common.c
@@ -1866,11 +1866,11 @@ config_item_clone (struct config_item_ *self)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static void
-config_schema_fix_value
- (struct config_schema *schema, struct config_item_ *object, void *user_data)
+config_schema_initialize_item (struct config_schema *schema,
+ struct config_item_ *parent, void *user_data)
{
struct config_item_ *item =
- str_map_find (&object->value.object, schema->name);
+ str_map_find (&parent->value.object, schema->name);
bool replace = true;
if (item)
@@ -1901,7 +1901,7 @@ config_schema_fix_value
schema->name, e->message);
// This will free the old item if there was any
- str_map_set (&object->value.object, schema->name, item);
+ str_map_set (&parent->value.object, schema->name, item);
}
// Make sure the string subtype fits the schema
@@ -1921,7 +1921,7 @@ config_schema_apply_to_object (struct config_schema *schema_array,
{
hard_assert (object->type == CONFIG_ITEM_OBJECT);
while (schema_array->name)
- config_schema_fix_value (schema_array++, object, user_data);
+ config_schema_initialize_item (schema_array++, object, user_data);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -