diff options
Diffstat (limited to 'src/greeter-session.c')
| -rw-r--r-- | src/greeter-session.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/greeter-session.c b/src/greeter-session.c index ace766f1..ac637c0d 100644 --- a/src/greeter-session.c +++ b/src/greeter-session.c @@ -42,23 +42,19 @@ static gboolean greeter_session_start (Session *session) { GreeterSession *s = GREETER_SESSION (session); - int to_greeter_pipe[2], from_greeter_pipe[2]; - int to_greeter_input, to_greeter_output, from_greeter_input, from_greeter_output; - g_autofree gchar *to_server_value = NULL; - g_autofree gchar *from_server_value = NULL; - gboolean result; /* Create a pipe to talk with the greeter */ + int to_greeter_pipe[2], from_greeter_pipe[2]; if (pipe (to_greeter_pipe) != 0 || pipe (from_greeter_pipe) != 0) { g_warning ("Failed to create pipes: %s", strerror (errno)); return FALSE; } - to_greeter_input = to_greeter_pipe[1]; - to_greeter_output = to_greeter_pipe[0]; - from_greeter_input = from_greeter_pipe[1]; - from_greeter_output = from_greeter_pipe[0]; + int to_greeter_input = to_greeter_pipe[1]; + int to_greeter_output = to_greeter_pipe[0]; + int from_greeter_input = from_greeter_pipe[1]; + int from_greeter_output = from_greeter_pipe[0]; greeter_set_file_descriptors (s->priv->greeter, to_greeter_input, from_greeter_output); /* Don't allow the daemon end of the pipes to be accessed in child processes */ @@ -66,12 +62,12 @@ greeter_session_start (Session *session) fcntl (from_greeter_output, F_SETFD, FD_CLOEXEC); /* Let the greeter session know how to communicate with the daemon */ - to_server_value = g_strdup_printf ("%d", from_greeter_input); + g_autofree gchar *to_server_value = g_strdup_printf ("%d", from_greeter_input); session_set_env (session, "LIGHTDM_TO_SERVER_FD", to_server_value); - from_server_value = g_strdup_printf ("%d", to_greeter_output); + g_autofree gchar *from_server_value = g_strdup_printf ("%d", to_greeter_output); session_set_env (session, "LIGHTDM_FROM_SERVER_FD", from_server_value); - result = SESSION_CLASS (greeter_session_parent_class)->start (session); + gboolean result = SESSION_CLASS (greeter_session_parent_class)->start (session); /* Close the session ends of the pipe */ close (from_greeter_input); @@ -114,7 +110,7 @@ greeter_session_class_init (GreeterSessionClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); session_class->start = greeter_session_start; - session_class->stop = greeter_session_stop; + session_class->stop = greeter_session_stop; object_class->finalize = greeter_session_finalize; g_type_class_add_private (klass, sizeof (GreeterSessionPrivate)); |