diff options
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 23 |
1 files changed, 1 insertions, 22 deletions
@@ -24,11 +24,6 @@ struct complist struct component *tail; }; -/* 0 on the first load, and 1 on all subsequent reloads. Tells the - component_config_commit whether we're starting from scratch or just - updating an already loaded configuration */ -static int loaded; - static struct complist comp_list[2]; static int cur; @@ -540,16 +535,7 @@ component_config_commit (void) comp_count = i; /* Rearrange components, registering entries for the new ones */ - for (comp = list->head, i = 0; comp; ) - { - struct component *next = comp->next; - if (loaded && comp->mode == pies_comp_startup) - { - /* Ignore startup components */ - component_unlink (comp); - component_free (comp); - } - else + for (comp = list->head, i = 0; comp; comp = comp->next, i++) { match = complist_find_match (prev, comp); if (match) @@ -563,12 +549,7 @@ component_config_commit (void) } comp_array[i] = comp; comp->arridx = i; - i++; } - comp = next; - } - /* Adjust comp_count */ - comp_count = i; /* Mark orphaned progs for termination */ list = &comp_list[prev]; @@ -585,8 +566,6 @@ component_config_commit (void) for (comp = comp_list[cur].head; comp; comp = comp->next) if (!comp->prog) register_prog (comp); - - loaded = 1; } static int |