fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-09 02:28:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: clean up warnings

Browse source
This commit is contained in:
Ray Strode 2011-02-09 14:44:56 -05:00
parent 25e2afde47
commit fc131db314
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main.c
View file

@ -1998,7 +1998,7 @@ main (int argc,
bool no_daemon = false;
bool debug = false;
bool attach_to_session;
ply_daemon_handle_t *daemon_handle;
ply_daemon_handle_t *daemon_handle = NULL;
char *mode_string = NULL;
char *tty = NULL;
@ -2111,13 +2111,13 @@ main (int argc,
{
if (errno == 0)
{
if (! no_daemon)
if (daemon_handle != NULL)
ply_detach_daemon (daemon_handle, 0);
return 0;
}
ply_error ("plymouthd: could not setup basic operating environment: %m");
if (! no_daemon)
if (daemon_handle != NULL)
ply_detach_daemon (daemon_handle, EX_OSERR);
return EX_OSERR;
}
@ -2141,17 +2141,17 @@ main (int argc,
if (state.boot_server == NULL)
{
ply_error ("plymouthd: could not log bootup: %m");
if (! no_daemon)
if (daemon_handle != NULL)
ply_detach_daemon (daemon_handle, EX_UNAVAILABLE);
return EX_UNAVAILABLE;
}
if (! no_daemon)
if (!ply_detach_daemon (daemon_handle, 0))
{
ply_error ("plymouthd: could not tell parent to exit: %m");
return EX_UNAVAILABLE;
}
if (daemon_handle != NULL
&& !ply_detach_daemon (daemon_handle, 0))
{
ply_error ("plymouthd: could not tell parent to exit: %m");
return EX_UNAVAILABLE;
}
state.progress = ply_progress_new ();