From fc131db31490f68d707986e071444e4d2f6e0d74 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 9 Feb 2011 14:44:56 -0500 Subject: [PATCH] main: clean up warnings --- src/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.c b/src/main.c index d5b1632a..032a3faa 100644 --- a/src/main.c +++ b/src/main.c @@ -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 ();