Unify print_desc() & print_result() in print() and refactor ...

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2014-04-21 14:05:56 +02:00
1 parent 26d49b2027
commit 40988b901c
4 files changed
+46 -29

No files matched your search

+2 -6
View File
@@ -160,8 +160,6 @@ static void banner(void)
int main(int argc, char* argv[])
{
int result;
if (getpid() != 1)
return client(argc, argv);
@@ -202,16 +200,14 @@ int main(int argc, char* argv[])
/*
* Parse configuration file
*/
result = parse_finit_conf(FINIT_CONF);
print_desc("Loading " FINIT_CONF, NULL);
print_result(result);
parse_finit_conf(FINIT_CONF);
/*
* Load plugins. Must run after finit.conf has registered
* all services, or service plugins won't have anything to
* hook on to.
*/
print_desc("Loading Finit plugins", NULL);
print_desc("Loading plugins", NULL);
print_result(plugin_load_all(PLUGIN_PATH));
/*