Transpose args in strv_fnmatch() to be more oo

[elogind.git] / src / reply-password / reply-password.c

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 73c2d1bbdfbbf34ccab6ff2e584e7b55ff7eb39c..abf5f525dd9c0e603f21ecba7cff470b3c10be31 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>
@@ -51,10 +51,8 @@ static int send_on_socket(int fd, const char *socket_name, const void *packet, s
 
         strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path));
 
-        if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0) {
-                log_error("Failed to send: %m");
-                return -errno;
-        }
+        if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0)
+                return log_error_errno(errno, "Failed to send: %m");
 
         return 0;
 }
@@ -77,7 +75,7 @@ int main(int argc, char *argv[]) {
 
                 packet[0] = '+';
                 if (!fgets(packet+1, sizeof(packet)-1, stdin)) {
-                        log_error("Failed to read password: %m");
+                        log_error_errno(errno, "Failed to read password: %m");
                         goto finish;
                 }
 
@@ -93,7 +91,7 @@ int main(int argc, char *argv[]) {
 
         fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
         if (fd < 0) {
-                log_error("socket() failed: %m");
+                log_error_errno(errno, "socket() failed: %m");
                 goto finish;
         }