commit 33f8c194f9379ffa444c3c44d23e70f80fef5e5b
author Elliott Hughes <enh@google.com> Tue Aug 23 01:20:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 01:20:36 2016 +0000
tree b6458ea4200aa8f57a9c51320c72e4fbde231cee
parent e4d79532de4c6e89d973dcc9f93dc16377672b70
parent fca43d3ec5b39f870a93fa631c5790317689943e

Merge "liblog: use SOCK_NONBLOCK directly."
am: fca43d3ec5

Change-Id: I4d959d9091adbf8bf2d7b68653a3c6064893a65a

liblog/logd_writer.c

diff --git a/liblog/logd_writer.c b/liblog/logd_writer.c
index 059f170..ed82902 100644
--- a/liblog/logd_writer.c
+++ b/liblog/logd_writer.c
@@ -67,12 +67,9 @@
     int i, ret = 0;
 
     if (logdLoggerWrite.context.sock < 0) {
-        i = TEMP_FAILURE_RETRY(socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0));
+        i = TEMP_FAILURE_RETRY(socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
         if (i < 0) {
             ret = -errno;
-        } else if (TEMP_FAILURE_RETRY(fcntl(i, F_SETFL, O_NONBLOCK)) < 0) {
-            ret = -errno;
-            close(i);
         } else {
             struct sockaddr_un un;
             memset(&un, 0, sizeof(struct sockaddr_un));