~vorlon/ubuntu/raring/upstart/lp.1199778

Viewing all changes in revision 921.

  • Committer: Scott James Remnant
  • Date: 2008-04-29 18:58:44 UTC
  • Revision ID: scott@netsplit.com-20080429185844-p3p9n39272an9na1
* init/conf.h (ConfFile): Change type of job member, but leave name.
Add prototype for new function.
* init/conf.c (conf_reload_path): Somewhat simplify the case of
having parsed a job, we only need to call job_class_consider() now
to have it dealt with.
(conf_file_destroy): Likewise after removing the ConfFile from the
source (so it won't get considered) and marking the job class as
deleted, we only need to call job_class_reconsider() and check the
return value to see whether we've been replaced.
(conf_select_job): In return we provide the function to decide which
of the available job sources is the best one.
* init/tests/test_conf.c: Update types in tests.
(test_select_job): Test the new function.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: