logind: unify how we cast between uid_t and pointers for hashmap keys

[elogind.git] / src / shared / spawn-polkit-agent.c

diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index f9e52cdcbd192a6007351a66bba3c30d7fd1f4d8..e7419b5ee4c9e206951ba7a2af9b53a678a86e1d 100644 (file)
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -61,15 +61,15 @@ int polkit_agent_open(void) {
                        POLKIT_AGENT_BINARY_PATH, "--notify-fd", notify_fd, "--fallback", NULL);
 
         /* Close the writing side, because that's the one for the agent */
-        close_nointr_nofail(pipe_fd[1]);
+        safe_close(pipe_fd[1]);
 
         if (r < 0)
-                log_error("Failed to fork TTY ask password agent: %s", strerror(-r));
+                log_error_errno(r, "Failed to fork TTY ask password agent: %m");
         else
                 /* Wait until the agent closes the fd */
-                fd_wait_for_event(pipe_fd[0], POLLHUP, (usec_t) -1);
+                fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY);
 
-        close_nointr_nofail(pipe_fd[0]);
+        safe_close(pipe_fd[0]);
 
         return r;
 }
@@ -82,7 +82,7 @@ void polkit_agent_close(void) {
         /* Inform agent that we are done */
         kill(agent_pid, SIGTERM);
         kill(agent_pid, SIGCONT);
-        wait_for_terminate(agent_pid, NULL);
+        (void) wait_for_terminate(agent_pid, NULL);
         agent_pid = 0;
 }