summaryrefslogtreecommitdiffabout
path: root/src/comp.c
Unidiff
Diffstat (limited to 'src/comp.c') (more/less context) (show whitespace changes)
-rw-r--r--src/comp.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/comp.c b/src/comp.c
index 2346306..25f2657 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -24,11 +24,6 @@ struct complist
24 struct component *tail; 24 struct component *tail;
25}; 25};
26 26
27/* 0 on the first load, and 1 on all subsequent reloads. Tells the
28 component_config_commit whether we're starting from scratch or just
29 updating an already loaded configuration */
30static int loaded;
31
32static struct complist comp_list[2]; 27static struct complist comp_list[2];
33static int cur; 28static int cur;
34 29
@@ -540,16 +535,7 @@ component_config_commit (void)
540 comp_count = i; 535 comp_count = i;
541 536
542 /* Rearrange components, registering entries for the new ones */ 537 /* Rearrange components, registering entries for the new ones */
543 for (comp = list->head, i = 0; comp; ) 538 for (comp = list->head, i = 0; comp; comp = comp->next, i++)
544 {
545 struct component *next = comp->next;
546 if (loaded && comp->mode == pies_comp_startup)
547 {
548 /* Ignore startup components */
549 component_unlink (comp);
550 component_free (comp);
551 }
552 else
553 { 539 {
554 match = complist_find_match (prev, comp); 540 match = complist_find_match (prev, comp);
555 if (match) 541 if (match)
@@ -563,12 +549,7 @@ component_config_commit (void)
563 } 549 }
564 comp_array[i] = comp; 550 comp_array[i] = comp;
565 comp->arridx = i; 551 comp->arridx = i;
566 i++;
567 } 552 }
568 comp = next;
569 }
570 /* Adjust comp_count */
571 comp_count = i;
572 553
573 /* Mark orphaned progs for termination */ 554 /* Mark orphaned progs for termination */
574 list = &comp_list[prev]; 555 list = &comp_list[prev];
@@ -585,8 +566,6 @@ component_config_commit (void)
585 for (comp = comp_list[cur].head; comp; comp = comp->next) 566 for (comp = comp_list[cur].head; comp; comp = comp->next)
586 if (!comp->prog) 567 if (!comp->prog)
587 register_prog (comp); 568 register_prog (comp);
588
589 loaded = 1;
590} 569}
591 570
592static int 571static int

Return to:

Send suggestions and report system problems to the System administrator.