commit 8f58d2d85ce0e16a3314b5b063d2921e64ba7005
author Elliott Hughes <enh@google.com> Tue Aug 23 01:23:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 01:23:29 2016 +0000
tree 54cf8864e0893a07d4c4436d60d5a258eb02a3df
parent a42eef49138d3d7ae9598f81fbb6602abb76a3e4
parent fca737e3be4c991db34ddcafb320e4a67a930e17

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

Change-Id: I742833b2933d1ab17543839f9749a7c4d7f13944

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));