p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 11 Wiki Activity

degesch: set "user_data" while loading config

Browse Source 
It'd be quite wrong to call "on_change" on them without this.
This commit is contained in:
Přemysl Eric Janouch
2015-07-05 01:56:00 +02:00
parent 9b41256ebf
commit b1dd34a7ba
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common.c
View File

@@ -1865,11 +1865,9 @@ config_item_clone (struct config_item_ *self)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: maybe also make it possible to assign the "user_data" pointer
static void
config_schema_fix_value
(struct config_schema *schema, struct config_item_ *object)
(struct config_schema *schema, struct config_item_ *object, void *user_data)
{
struct config_item_ *item =
str_map_find (&object->value.object, schema->name);
@@ -1912,17 +1910,18 @@ config_schema_fix_value
item->type = schema->type;
item->schema = schema;
item->user_data = user_data;
if (schema->on_change)
schema->on_change (item);
}
static void
config_schema_apply_to_object
(struct config_schema *schema_array, struct config_item_ *object)
config_schema_apply_to_object (struct config_schema *schema_array,
struct config_item_ *object, void *user_data)
{
hard_assert (object->type == CONFIG_ITEM_OBJECT);
while (schema_array->name)
config_schema_fix_value (schema_array++, object);
config_schema_fix_value (schema_array++, object, user_data);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -